From 866b071f099f96898563f9a003c2dbb03bb90339 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@videolan.org>
Date: Tue, 25 Sep 2018 19:18:17 +0300
Subject: [PATCH] Updated mainline nginx to 1.15.4 and njs to 0.2.4.

---
 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 30997c4..0f5e43f 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.15.3
+ENV NGINX_VERSION 1.15.4
 
 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 	&& CONFIG="\
diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile
index a3dcbbd..41bf64a 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.15.3
+ENV NGINX_VERSION 1.15.4
 
 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 	&& CONFIG="\
diff --git a/mainline/stretch-perl/Dockerfile b/mainline/stretch-perl/Dockerfile
index 31528e9..cc0f9f8 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.3-1~stretch
-ENV NJS_VERSION   1.15.3.0.2.3-1~stretch
+ENV NGINX_VERSION 1.15.4-1~stretch
+ENV NJS_VERSION   1.15.4.0.2.4-1~stretch
 
 RUN set -x \
 	&& apt-get update \
diff --git a/mainline/stretch/Dockerfile b/mainline/stretch/Dockerfile
index 2aa0975..6679326 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.3-1~stretch
-ENV NJS_VERSION   1.15.3.0.2.3-1~stretch
+ENV NGINX_VERSION 1.15.4-1~stretch
+ENV NJS_VERSION   1.15.4.0.2.4-1~stretch
 
 RUN set -x \
 	&& apt-get update \
-- 
GitLab