diff --git a/Dockerfile b/Dockerfile index 412561b..19fabda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ # # Nginx image with Consul Template # -FROM nginx:1.11 +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 8a2b5d8..4831c6b 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,14 +1,14 @@ # # Nginx image with Consul Template, based on Alpine Linux # -FROM nginx:1.11-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 / 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