From f4144b803aca8ba2a66afa9e4b20742eef469ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Portebois?= Date: Thu, 19 Oct 2017 16:30:09 -0400 Subject: [PATCH 1/2] Update S6 overlay and Consul template to current versions --- Dockerfile | 2 +- Dockerfile-alpine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e09c682..d0f01f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ 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..d36c3ac 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -8,7 +8,7 @@ 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 10f49a7bbdb5540bd79091191505f5b67770b8ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Portebois?= Date: Thu, 19 Oct 2017 16:30:34 -0400 Subject: [PATCH 2/2] 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