From f607ade508aff7d705e189e2d0adeec02d9bc939 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 24 Aug 2019 16:31:54 +0200 Subject: [PATCH] Bumbed version of docker images --- .travis.yml | 2 +- Dockerfile | 4 ++-- docker-compose.yml | 2 +- package-lock.json | 41 ++++++++++++++++++++++++++++++----------- 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index de2deb3e..8f155e19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: node_js node_js: - - "10.15.3" + - "10.16.3" cache: directories: diff --git a/Dockerfile b/Dockerfile index e928f61b..1e28624c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM node:10.15.3-alpine as node +FROM node:10.16.3-alpine as node COPY . /shlink-web-client RUN cd /shlink-web-client && npm install && npm run build -FROM nginx:1.15.9-alpine +FROM nginx:1.17.3-alpine LABEL maintainer="Alejandro Celaya " RUN rm -r /usr/share/nginx/html COPY --from=node /shlink-web-client/build /usr/share/nginx/html diff --git a/docker-compose.yml b/docker-compose.yml index 99adb3e0..4f9dd421 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: shlink_web_client_node: container_name: shlink_web_client_node - image: node:10.15.3-alpine + image: node:10.16.3-alpine command: /bin/sh -c "cd /home/shlink/www && npm install && npm run start" volumes: - ./:/home/shlink/www diff --git a/package-lock.json b/package-lock.json index 415d030c..9b5adeb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7256,7 +7256,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -7277,12 +7278,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7297,17 +7300,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -7424,7 +7430,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -7436,6 +7443,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7450,6 +7458,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7457,12 +7466,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7481,6 +7492,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7561,7 +7573,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7573,6 +7586,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7658,7 +7672,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -7694,6 +7709,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7713,6 +7729,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7756,12 +7773,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } },