From f603bb3632ea6df0bc9da2179c18eb322c286298 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov <thresh@videolan.org> Date: Tue, 5 Jun 2018 18:06:02 +0300 Subject: [PATCH] Updated mainline nginx to 1.15.0 and njs to 0.2.1. --- mainline/alpine-perl/Dockerfile | 2 +- mainline/alpine/Dockerfile | 2 +- mainline/stretch-perl/Dockerfile | 4 ++-- mainline/stretch/Dockerfile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile index 5a6cb7a..22c88cb 100644 --- a/mainline/alpine-perl/Dockerfile +++ b/mainline/alpine-perl/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.13.12 +ENV NGINX_VERSION 1.15.0 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && CONFIG="\ diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile index 228c8c7..a7fff63 100644 --- a/mainline/alpine/Dockerfile +++ b/mainline/alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV NGINX_VERSION 1.13.12 +ENV NGINX_VERSION 1.15.0 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && CONFIG="\ diff --git a/mainline/stretch-perl/Dockerfile b/mainline/stretch-perl/Dockerfile index d951339..e38624a 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.13.12-1~stretch -ENV NJS_VERSION 1.13.12.0.2.0-1~stretch +ENV NGINX_VERSION 1.15.0-1~stretch +ENV NJS_VERSION 1.15.0.0.2.1-1~stretch RUN set -x \ && apt-get update \ diff --git a/mainline/stretch/Dockerfile b/mainline/stretch/Dockerfile index e7225eb..61727aa 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.13.12-1~stretch -ENV NJS_VERSION 1.13.12.0.2.0-1~stretch +ENV NGINX_VERSION 1.15.0-1~stretch +ENV NJS_VERSION 1.15.0.0.2.1-1~stretch RUN set -x \ && apt-get update \ -- GitLab