From fe2d394831d6703f67517d586f5f455f68a66d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Laubacher?= Date: Sat, 16 Nov 2019 10:24:34 +0100 Subject: [PATCH 1/3] Update baseimages Nginx can be set to the latest patch version, as its API is really stable. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6d91fa2..330fdc4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM node:12.11.0-alpine as node +FROM node:12.11.1-alpine as node COPY . /shlink-web-client RUN cd /shlink-web-client && npm install && npm run build -FROM nginx:1.17.4-alpine +FROM nginx:1.17-alpine LABEL maintainer="Alejandro Celaya " RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf From fb25e44b58e7e056c2ea230d12ad7a84dd0a6b9f Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Thu, 21 Nov 2019 07:52:50 +0100 Subject: [PATCH 2/3] Used strict version number for nginx base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 330fdc4f..850464b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:12.11.1-alpine as node COPY . /shlink-web-client RUN cd /shlink-web-client && npm install && npm run build -FROM nginx:1.17-alpine +FROM nginx:1.17.5-alpine LABEL maintainer="Alejandro Celaya " RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf From 727b21974231cc1ed8f24035883c6ee0a41ae8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Laubacher?= Date: Thu, 21 Nov 2019 07:55:40 +0100 Subject: [PATCH 3/3] Update nginx image to latest version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 850464b1..5fd97db7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:12.11.1-alpine as node COPY . /shlink-web-client RUN cd /shlink-web-client && npm install && npm run build -FROM nginx:1.17.5-alpine +FROM nginx:1.17.6-alpine LABEL maintainer="Alejandro Celaya " RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf