Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated mainline nginx to 1.15.8. #5228

Merged
merged 1 commit into from
Dec 26, 2018
Merged

Conversation

thresheek
Copy link
Contributor

No description provided.

@tianon
Copy link
Member

tianon commented Dec 26, 2018

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 97a55bc..d3abe91 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,10 +14,10 @@ nginx:1.15
 nginx:1.15-alpine
 nginx:1.15-alpine-perl
 nginx:1.15-perl
-nginx:1.15.7
-nginx:1.15.7-alpine
-nginx:1.15.7-alpine-perl
-nginx:1.15.7-perl
+nginx:1.15.8
+nginx:1.15.8-alpine
+nginx:1.15.8-alpine-perl
+nginx:1.15.8-perl
 nginx:alpine
 nginx:alpine-perl
 nginx:latest
diff --git a/nginx_alpine-perl/Dockerfile b/nginx_alpine-perl/Dockerfile
index e2e73e5..58c62c0 100644
--- a/nginx_alpine-perl/Dockerfile
+++ b/nginx_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.7
+ENV NGINX_VERSION 1.15.8
 
 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 	&& CONFIG="\
diff --git a/nginx_alpine/Dockerfile b/nginx_alpine/Dockerfile
index 614ef3d..771d5b0 100644
--- a/nginx_alpine/Dockerfile
+++ b/nginx_alpine/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.15.7
+ENV NGINX_VERSION 1.15.8
 
 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 	&& CONFIG="\
diff --git a/nginx_latest/Dockerfile b/nginx_latest/Dockerfile
index 4be26e8..09e2d84 100644
--- a/nginx_latest/Dockerfile
+++ b/nginx_latest/Dockerfile
@@ -2,8 +2,8 @@ FROM debian:stretch-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.15.7-1~stretch
-ENV NJS_VERSION   1.15.7.0.2.6-1~stretch
+ENV NGINX_VERSION 1.15.8-1~stretch
+ENV NJS_VERSION   1.15.8.0.2.7-1~stretch
 
 RUN set -x \
 	&& apt-get update \
diff --git a/nginx_perl/Dockerfile b/nginx_perl/Dockerfile
index edc26c0..156f343 100644
--- a/nginx_perl/Dockerfile
+++ b/nginx_perl/Dockerfile
@@ -2,8 +2,8 @@ FROM debian:stretch-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.15.7-1~stretch
-ENV NJS_VERSION   1.15.7.0.2.6-1~stretch
+ENV NGINX_VERSION 1.15.8-1~stretch
+ENV NJS_VERSION   1.15.8.0.2.7-1~stretch
 
 RUN set -x \
 	&& apt-get update \

@tianon
Copy link
Member

tianon commented Dec 26, 2018

LGTM

Build test of #5228; 19215e2; amd64 (nginx):

$ bashbrew build nginx:1.15.8
Building bashbrew/cache:56a72dbf33ebdd452cf3031c87e6d8ea3c7288348a8b875f30f1c5259dc5c27d (nginx:1.15.8)
Tagging nginx:1.15.8
Tagging nginx:mainline
Tagging nginx:1
Tagging nginx:1.15
Tagging nginx:latest

$ test/run.sh nginx:1.15.8
testing nginx:1.15.8
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nginx:1.15.8-perl
Building bashbrew/cache:e5bf906f1957d0ee367017ce4271224d8ded0f002683431cbd598bbf42aa7c31 (nginx:1.15.8-perl)
Tagging nginx:1.15.8-perl
Tagging nginx:mainline-perl
Tagging nginx:1-perl
Tagging nginx:1.15-perl
Tagging nginx:perl

$ test/run.sh nginx:1.15.8-perl
testing nginx:1.15.8-perl
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nginx:1.15.8-alpine
Building bashbrew/cache:0b5b94f277c6c08a46eb6cbe1ba93b6d96b1664511078a076b18d698bba10fb4 (nginx:1.15.8-alpine)
Tagging nginx:1.15.8-alpine
Tagging nginx:mainline-alpine
Tagging nginx:1-alpine
Tagging nginx:1.15-alpine
Tagging nginx:alpine

$ test/run.sh nginx:1.15.8-alpine
testing nginx:1.15.8-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nginx:1.15.8-alpine-perl
Building bashbrew/cache:cc76cf91820375d7fdd993e34992e28a2f4443e436100b9b07f965fa4012bd86 (nginx:1.15.8-alpine-perl)
Tagging nginx:1.15.8-alpine-perl
Tagging nginx:mainline-alpine-perl
Tagging nginx:1-alpine-perl
Tagging nginx:1.15-alpine-perl
Tagging nginx:alpine-perl

$ test/run.sh nginx:1.15.8-alpine-perl
testing nginx:1.15.8-alpine-perl
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nginx:1.14.2
Using bashbrew/cache:3196676fdc6344a2c59d17fc8b7eaa9ae35d4c2820e6242162b311a44f48410a (nginx:1.14.2)
Tagging nginx:1.14.2
Tagging nginx:stable
Tagging nginx:1.14

$ test/run.sh nginx:1.14.2
testing nginx:1.14.2
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nginx:1.14.2-perl
Using bashbrew/cache:41dd587473b35a3a83fa25e8289fca20b01a94733656d1f139539fb4a0a165a7 (nginx:1.14.2-perl)
Tagging nginx:1.14.2-perl
Tagging nginx:stable-perl
Tagging nginx:1.14-perl

$ test/run.sh nginx:1.14.2-perl
testing nginx:1.14.2-perl
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nginx:1.14.2-alpine
Building bashbrew/cache:cdf754661ecf59a80cdf95d39a4a74b97b58115322bace8a38eff8667dabfcf5 (nginx:1.14.2-alpine)
Tagging nginx:1.14.2-alpine
Tagging nginx:stable-alpine
Tagging nginx:1.14-alpine

$ test/run.sh nginx:1.14.2-alpine
testing nginx:1.14.2-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nginx:1.14.2-alpine-perl
Building bashbrew/cache:1d6d2ae7833c504140baf8e173a2835dc7d94e6692c9823d27d7dfab908a367c (nginx:1.14.2-alpine-perl)
Tagging nginx:1.14.2-alpine-perl
Tagging nginx:stable-alpine-perl
Tagging nginx:1.14-alpine-perl

$ test/run.sh nginx:1.14.2-alpine-perl
testing nginx:1.14.2-alpine-perl
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit e7facb2 into docker-library:master Dec 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants