From f4d30145c60c433966df96f618d78513fee9d322 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov <thresh@videolan.org> Date: Tue, 6 Nov 2018 18:37:40 +0300 Subject: [PATCH] Updated mainline nginx to 1.15.6, stable to 1.14.1 and njs to 0.2.5. --- mainline/alpine-perl/Dockerfile | 2 +- mainline/alpine/Dockerfile | 2 +- mainline/stretch-perl/Dockerfile | 4 ++-- mainline/stretch/Dockerfile | 4 ++-- stable/alpine-perl/Dockerfile | 2 +- stable/alpine/Dockerfile | 2 +- stable/stretch-perl/Dockerfile | 4 ++-- stable/stretch/Dockerfile | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile index 2ee0e5a..8ee9528 100644 --- a/mainline/alpine-perl/Dockerfile +++ b/mainline/alpine-perl/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.8 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.15.5 +ENV NGINX_VERSION 1.15.6 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && CONFIG="\ diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile index 112b81d..6082f13 100644 --- a/mainline/alpine/Dockerfile +++ b/mainline/alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.8 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.15.5 +ENV NGINX_VERSION 1.15.6 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && CONFIG="\ diff --git a/mainline/stretch-perl/Dockerfile b/mainline/stretch-perl/Dockerfile index b51915c..df97634 100644 --- a/mainline/stretch-perl/Dockerfile +++ b/mainline/stretch-perl/Dockerfile @@ -2,8 +2,8 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.15.5-1~stretch -ENV NJS_VERSION 1.15.5.0.2.4-1~stretch +ENV NGINX_VERSION 1.15.6-1~stretch +ENV NJS_VERSION 1.15.6.0.2.5-1~stretch RUN set -x \ && apt-get update \ diff --git a/mainline/stretch/Dockerfile b/mainline/stretch/Dockerfile index f21be86..dfe575e 100644 --- a/mainline/stretch/Dockerfile +++ b/mainline/stretch/Dockerfile @@ -2,8 +2,8 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.15.5-1~stretch -ENV NJS_VERSION 1.15.5.0.2.4-1~stretch +ENV NGINX_VERSION 1.15.6-1~stretch +ENV NJS_VERSION 1.15.6.0.2.5-1~stretch RUN set -x \ && apt-get update \ diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile index 647d989..cdbfb6e 100644 --- a/stable/alpine-perl/Dockerfile +++ b/stable/alpine-perl/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.8 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.14.0 +ENV NGINX_VERSION 1.14.1 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && CONFIG="\ diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile index 579707f..488980b 100644 --- a/stable/alpine/Dockerfile +++ b/stable/alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.8 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.14.0 +ENV NGINX_VERSION 1.14.1 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && CONFIG="\ diff --git a/stable/stretch-perl/Dockerfile b/stable/stretch-perl/Dockerfile index 2e262ec..7895437 100644 --- a/stable/stretch-perl/Dockerfile +++ b/stable/stretch-perl/Dockerfile @@ -2,8 +2,8 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.14.0-1~stretch -ENV NJS_VERSION 1.14.0.0.2.0-1~stretch +ENV NGINX_VERSION 1.14.1-1~stretch +ENV NJS_VERSION 1.14.1.0.2.5-1~stretch RUN set -x \ && apt-get update \ diff --git a/stable/stretch/Dockerfile b/stable/stretch/Dockerfile index a436cf4..3a0ceb3 100644 --- a/stable/stretch/Dockerfile +++ b/stable/stretch/Dockerfile @@ -2,8 +2,8 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.14.0-1~stretch -ENV NJS_VERSION 1.14.0.0.2.0-1~stretch +ENV NGINX_VERSION 1.14.1-1~stretch +ENV NJS_VERSION 1.14.1.0.2.5-1~stretch RUN set -x \ && apt-get update \ -- GitLab