Updated nginx to 1.17.6 #7007
Merged
Updated nginx to 1.17.6 #7007
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index 87ebb67..a96d874 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,10 +14,10 @@ nginx:1.17
nginx:1.17-alpine
nginx:1.17-alpine-perl
nginx:1.17-perl
-nginx:1.17.5
-nginx:1.17.5-alpine
-nginx:1.17.5-alpine-perl
-nginx:1.17.5-perl
+nginx:1.17.6
+nginx:1.17.6-alpine
+nginx:1.17.6-alpine-perl
+nginx:1.17.6-perl
nginx:alpine
nginx:alpine-perl
nginx:latest
diff --git a/nginx_alpine-perl/Dockerfile b/nginx_alpine-perl/Dockerfile
index 5f25c71..f21b856 100644
--- a/nginx_alpine-perl/Dockerfile
+++ b/nginx_alpine-perl/Dockerfile
@@ -2,8 +2,8 @@ FROM alpine:3.10
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.17.5
-ENV NJS_VERSION 0.3.6
+ENV NGINX_VERSION 1.17.6
+ENV NJS_VERSION 0.3.7
ENV PKG_RELEASE 1
RUN set -x \
@@ -34,12 +34,8 @@ RUN set -x \
echo "key verification failed!"; \
exit 1; \
fi \
- && printf "%s%s%s\n" \
- "https://nginx.org/packages/mainline/alpine/v" \
- `egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release` \
- "/main" \
- | tee -a /etc/apk/repositories \
&& apk del .cert-deps \
+ && apk add -X "https://nginx.org/packages/mainline/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" --no-cache $nginxPackages \
;; \
*) \
# we're on an architecture upstream doesn't officially build for
@@ -75,18 +71,15 @@ RUN set -x \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
" \
- && echo "${tempDir}/packages/alpine/" >> /etc/apk/repositories \
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \
&& apk del .build-deps \
+ && apk add -X ${tempDir}/packages/alpine/ --no-cache $nginxPackages \
;; \
esac \
- && apk add --no-cache $nginxPackages \
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
&& if [ -n "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
&& if [ -n "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi \
-# remove the last line with the packages repos in the repositories file
- && sed -i '$ d' /etc/apk/repositories \
# Bring in gettext so we can get `envsubst`, then throw
# the rest away. To do this, we need to install `gettext`
# then move `envsubst` out of the way so `gettext` can
diff --git a/nginx_alpine/Dockerfile b/nginx_alpine/Dockerfile
index 9db13ac..1ca4bd4 100644
--- a/nginx_alpine/Dockerfile
+++ b/nginx_alpine/Dockerfile
@@ -2,8 +2,8 @@ FROM alpine:3.10
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.17.5
-ENV NJS_VERSION 0.3.6
+ENV NGINX_VERSION 1.17.6
+ENV NJS_VERSION 0.3.7
ENV PKG_RELEASE 1
RUN set -x \
@@ -33,12 +33,8 @@ RUN set -x \
echo "key verification failed!"; \
exit 1; \
fi \
- && printf "%s%s%s\n" \
- "https://nginx.org/packages/mainline/alpine/v" \
- `egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release` \
- "/main" \
- | tee -a /etc/apk/repositories \
&& apk del .cert-deps \
+ && apk add -X "https://nginx.org/packages/mainline/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" --no-cache $nginxPackages \
;; \
*) \
# we're on an architecture upstream doesn't officially build for
@@ -74,18 +70,15 @@ RUN set -x \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
" \
- && echo "${tempDir}/packages/alpine/" >> /etc/apk/repositories \
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \
&& apk del .build-deps \
+ && apk add -X ${tempDir}/packages/alpine/ --no-cache $nginxPackages \
;; \
esac \
- && apk add --no-cache $nginxPackages \
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
&& if [ -n "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
&& if [ -n "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi \
-# remove the last line with the packages repos in the repositories file
- && sed -i '$ d' /etc/apk/repositories \
# Bring in gettext so we can get `envsubst`, then throw
# the rest away. To do this, we need to install `gettext`
# then move `envsubst` out of the way so `gettext` can
diff --git a/nginx_latest/Dockerfile b/nginx_latest/Dockerfile
index 01601cd..f039a63 100644
--- a/nginx_latest/Dockerfile
+++ b/nginx_latest/Dockerfile
@@ -2,8 +2,8 @@ FROM debian:buster-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.17.5
-ENV NJS_VERSION 0.3.6
+ENV NGINX_VERSION 1.17.6
+ENV NJS_VERSION 0.3.7
ENV PKG_RELEASE 1~buster
RUN set -x \
diff --git a/nginx_perl/Dockerfile b/nginx_perl/Dockerfile
index e7c11ed..467dd49 100644
--- a/nginx_perl/Dockerfile
+++ b/nginx_perl/Dockerfile
@@ -2,8 +2,8 @@ FROM debian:buster-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.17.5
-ENV NJS_VERSION 0.3.6
+ENV NGINX_VERSION 1.17.6
+ENV NJS_VERSION 0.3.7
ENV PKG_RELEASE 1~buster
RUN set -x \ |
|
LGTM Build test of #7007; 5a984d6; $ bashbrew build nginx:1.17.6
Building bashbrew/cache:f3cb96b9d8f8f6f9130b0708088e49ddd137786b8f85213f82d6326cacb9a346 (nginx:1.17.6)
Tagging nginx:1.17.6
Tagging nginx:mainline
Tagging nginx:1
Tagging nginx:1.17
Tagging nginx:latest
$ test/run.sh nginx:1.17.6
testing nginx:1.17.6
'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.17.6-perl
Building bashbrew/cache:00b4da52ae81a201b2298b566c13996ec16fd7618143d20cb0fd779c9795a5b0 (nginx:1.17.6-perl)
Tagging nginx:1.17.6-perl
Tagging nginx:mainline-perl
Tagging nginx:1-perl
Tagging nginx:1.17-perl
Tagging nginx:perl
$ test/run.sh nginx:1.17.6-perl
testing nginx:1.17.6-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.17.6-alpine
Building bashbrew/cache:ce3f0a20edc08e69e866295e14de0c5605b75811d412a79fec78bdec170264bf (nginx:1.17.6-alpine)
Tagging nginx:1.17.6-alpine
Tagging nginx:mainline-alpine
Tagging nginx:1-alpine
Tagging nginx:1.17-alpine
Tagging nginx:alpine
$ test/run.sh nginx:1.17.6-alpine
testing nginx:1.17.6-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.17.6-alpine-perl
Building bashbrew/cache:cb7b5d6cd0ed77373e1142e80a7c06df677f2b8266de19d9da01c8ed750cbd5c (nginx:1.17.6-alpine-perl)
Tagging nginx:1.17.6-alpine-perl
Tagging nginx:mainline-alpine-perl
Tagging nginx:1-alpine-perl
Tagging nginx:1.17-alpine-perl
Tagging nginx:alpine-perl
$ test/run.sh nginx:1.17.6-alpine-perl
testing nginx:1.17.6-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.16.1
Using bashbrew/cache:9be58503bb60f259ea004456cbeb8965fabe92a72f09605dd38cc8c7bcd8fad8 (nginx:1.16.1)
Tagging nginx:1.16.1
Tagging nginx:stable
Tagging nginx:1.16
$ test/run.sh nginx:1.16.1
testing nginx:1.16.1
'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.16.1-perl
Using bashbrew/cache:dcd28ca7f81e23bcf21b2baddf41589e6ed989b975d3b8a88d687fe54ef88fda (nginx:1.16.1-perl)
Tagging nginx:1.16.1-perl
Tagging nginx:stable-perl
Tagging nginx:1.16-perl
$ test/run.sh nginx:1.16.1-perl
testing nginx:1.16.1-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.16.1-alpine
Using bashbrew/cache:15705f121c11c6b9fb9a3849c42b5b310077bcd722d0a7654f533da259087257 (nginx:1.16.1-alpine)
Tagging nginx:1.16.1-alpine
Tagging nginx:stable-alpine
Tagging nginx:1.16-alpine
$ test/run.sh nginx:1.16.1-alpine
testing nginx:1.16.1-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.16.1-alpine-perl
Using bashbrew/cache:c02a89caad19f91c70bd0bc1fb248c945d750db7903a2a2d77f5dd66007cdd64 (nginx:1.16.1-alpine-perl)
Tagging nginx:1.16.1-alpine-perl
Tagging nginx:stable-alpine-perl
Tagging nginx:1.16-alpine-perl
$ test/run.sh nginx:1.16.1-alpine-perl
testing nginx:1.16.1-alpine-perl
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.