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 nginx to 1.15.5. #4907

Merged
merged 1 commit into from
Oct 2, 2018
Merged

Conversation

thresheek
Copy link
Contributor

No description provided.

@yosifkit
Copy link
Member

yosifkit commented Oct 2, 2018

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 8c66553..bed0fda 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.4
-nginx:1.15.4-alpine
-nginx:1.15.4-alpine-perl
-nginx:1.15.4-perl
+nginx:1.15.5
+nginx:1.15.5-alpine
+nginx:1.15.5-alpine-perl
+nginx:1.15.5-perl
 nginx:alpine
 nginx:alpine-perl
 nginx:latest
diff --git a/nginx_alpine-perl/Dockerfile b/nginx_alpine-perl/Dockerfile
index f739e89..2ee0e5a 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.4
+ENV NGINX_VERSION 1.15.5
 
 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 	&& CONFIG="\
diff --git a/nginx_alpine/Dockerfile b/nginx_alpine/Dockerfile
index 4245032..112b81d 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.4
+ENV NGINX_VERSION 1.15.5
 
 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 	&& CONFIG="\
diff --git a/nginx_latest/Dockerfile b/nginx_latest/Dockerfile
index 6679326..f21be86 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.4-1~stretch
-ENV NJS_VERSION   1.15.4.0.2.4-1~stretch
+ENV NGINX_VERSION 1.15.5-1~stretch
+ENV NJS_VERSION   1.15.5.0.2.4-1~stretch
 
 RUN set -x \
 	&& apt-get update \
diff --git a/nginx_perl/Dockerfile b/nginx_perl/Dockerfile
index cc0f9f8..b51915c 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.4-1~stretch
-ENV NJS_VERSION   1.15.4.0.2.4-1~stretch
+ENV NGINX_VERSION 1.15.5-1~stretch
+ENV NJS_VERSION   1.15.5.0.2.4-1~stretch
 
 RUN set -x \
 	&& apt-get update \

@yosifkit
Copy link
Member

yosifkit commented Oct 2, 2018

Build test of #4907; 0d21a53; amd64 (nginx):

$ bashbrew build nginx:1.15.5
Building bashbrew/cache:95d311e4b104160a0addb2d787b18608d15969bd95aaf1458389a539e92798cc (nginx:1.15.5)
Tagging nginx:1.15.5
Tagging nginx:mainline
Tagging nginx:1
Tagging nginx:1.15
Tagging nginx:latest

$ test/run.sh nginx:1.15.5
testing nginx:1.15.5
	'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.5-perl
Building bashbrew/cache:5eb8e7006617e9d3c588b54e641c72a251350502faee0f295b859e773cdf2237 (nginx:1.15.5-perl)
Tagging nginx:1.15.5-perl
Tagging nginx:mainline-perl
Tagging nginx:1-perl
Tagging nginx:1.15-perl
Tagging nginx:perl

$ test/run.sh nginx:1.15.5-perl
testing nginx:1.15.5-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.5-alpine
Building bashbrew/cache:5d6d54406c03ead652dfe4ff97f763ceadcafeb34452e0b9d12ac9c6ae7d8350 (nginx:1.15.5-alpine)
Tagging nginx:1.15.5-alpine
Tagging nginx:mainline-alpine
Tagging nginx:1-alpine
Tagging nginx:1.15-alpine
Tagging nginx:alpine

$ test/run.sh nginx:1.15.5-alpine
testing nginx:1.15.5-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.5-alpine-perl
Building bashbrew/cache:23369d70006bf42cd59dd3d2186c601cae9c36e86b0772c49ae712f2bfdcfeff (nginx:1.15.5-alpine-perl)
Tagging nginx:1.15.5-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.5-alpine-perl
testing nginx:1.15.5-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.0
Using bashbrew/cache:9d9a5cad78839c9ffe6c1c4b2674c4b8e8309b396d3abd91dea68af0a6075c96 (nginx:1.14.0)
Tagging nginx:1.14.0
Tagging nginx:stable
Tagging nginx:1.14

$ test/run.sh nginx:1.14.0
testing nginx:1.14.0
	'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.0-perl
Using bashbrew/cache:0636753646eacbcf8d99fef4b2e01c5d439e15c08ea9a14398c6d907917871a5 (nginx:1.14.0-perl)
Tagging nginx:1.14.0-perl
Tagging nginx:stable-perl
Tagging nginx:1.14-perl

$ test/run.sh nginx:1.14.0-perl
testing nginx:1.14.0-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.0-alpine
Using bashbrew/cache:6bd31f4765f308243ac932280d99d9adfc1157efb75c208f54fbf2349c2ff108 (nginx:1.14.0-alpine)
Tagging nginx:1.14.0-alpine
Tagging nginx:stable-alpine
Tagging nginx:1.14-alpine

$ test/run.sh nginx:1.14.0-alpine
testing nginx:1.14.0-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.0-alpine-perl
Using bashbrew/cache:236ae602d686dfeb40bb7e14e6941f58a3c9b26787ad68c21be7f95a1ed3a8b5 (nginx:1.14.0-alpine-perl)
Tagging nginx:1.14.0-alpine-perl
Tagging nginx:stable-alpine-perl
Tagging nginx:1.14-alpine-perl

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

@yosifkit yosifkit merged commit abd037a into docker-library:master Oct 2, 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