From 042743245807b50a3179ce6e7aa0d08c88e47407 Mon Sep 17 00:00:00 2001 From: Julien St-Laurent Date: Tue, 25 Apr 2017 20:34:25 -0400 Subject: [PATCH 1/3] Update to new mainline version --- Dockerfile | 2 +- Dockerfile-alpine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 412561b..e09c682 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Nginx image with Consul Template # -FROM nginx:1.11 +FROM nginx:1.13 MAINTAINER 1science Devops Team RUN apt-get update && apt-get install -y curl unzip less vim diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 8a2b5d8..152a08b 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,7 +1,7 @@ # # Nginx image with Consul Template, based on Alpine Linux # -FROM nginx:1.11-alpine +FROM nginx:1.13-alpine MAINTAINER 1science Devops Team RUN apk update && apk upgrade && \ From 727647e05179eceea44e96ea74bc254811d7e14f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Portebois?= Date: Thu, 19 Oct 2017 16:33:51 -0400 Subject: [PATCH 2/3] Use curent stable with updated S6 overlay and Consul template --- Dockerfile | 4 ++-- Dockerfile-alpine | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index e09c682..19fabda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ # # Nginx image with Consul Template # -FROM nginx:1.13 +FROM nginx:1.12 MAINTAINER 1science Devops Team RUN apt-get update && apt-get install -y curl unzip less vim # Consul template for configuration management -ENV S6_OVERLAY_VERSION=1.19.1.1 CONSUL_TEMPLATE_VERSION=0.18.2 +ENV S6_OVERLAY_VERSION=1.21.0.3 CONSUL_TEMPLATE_VERSION=0.19.3 # Install S6 Overlay and Consul Template RUN curl -Ls https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz | tar -xz -C / diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 152a08b..4831c6b 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,14 +1,14 @@ # # Nginx image with Consul Template, based on Alpine Linux # -FROM nginx:1.13-alpine +FROM nginx:1.12-alpine MAINTAINER 1science Devops Team RUN apk update && apk upgrade && \ apk add curl wget bash tree unzip less vim # Consul template for configuration management -ENV S6_OVERLAY_VERSION=1.19.1.1 CONSUL_TEMPLATE_VERSION=0.18.2 +ENV S6_OVERLAY_VERSION=1.21.0.3 CONSUL_TEMPLATE_VERSION=0.19.3 # Install S6 Overlay and Consul Template RUN curl -Ls https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz | tar -xz -C / From a879a0da2484e934b4277dad7f2141b0c2a98422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Portebois?= Date: Thu, 19 Oct 2017 16:34:13 -0400 Subject: [PATCH 3/3] Fix broken line in readme --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index f69c1c7..4407c75 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,6 @@ Each branch give the related image tag. # License -All the code contained in this repository, unless explicitly stated, is -licensed under ISC license. +All the code contained in this repository, unless explicitly stated, is licensed under ISC license. A copy of the license can be found inside the [LICENSE](LICENSE) file. \ No newline at end of file