Skip to content

Commit 4785a60

Browse files
thresheekthresheek
committed
Regenerated after last commits.
1 parent ce83222 commit 4785a60

File tree

8 files changed

+46
-46
lines changed

8 files changed

+46
-46
lines changed

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ RUN set -x \
2222
x86_64|aarch64) \
2323
# arches officially built by upstream
2424
set -x \
25-
&& KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \
25+
&& KEY_SHA512="e09fa32f0a0eab2b879ccbbc4d0e4fb9751486eedda75e35fac65802cc9faa266425edf83e261137a2f4d16281ce2c1a5f4502930fe75154723da014214f0655" \
2626
&& wget -O /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub \
27-
&& if [ "$(openssl rsa -pubin -in /tmp/nginx_signing.rsa.pub -text -noout | openssl sha512 -r)" = "$KEY_SHA512" ]; then \
27+
&& if echo "$KEY_SHA512 */tmp/nginx_signing.rsa.pub" | sha512sum -c -; then \
2828
echo "key verification succeeded!"; \
2929
mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/; \
3030
else \
@@ -54,16 +54,16 @@ RUN set -x \
5454
&& su nobody -s /bin/sh -c " \
5555
export HOME=${tempDir} \
5656
&& cd ${tempDir} \
57-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
58-
&& PKGOSSCHECKSUM=\"98d244d5dea3f0c49692843b1857e21dc7353e749f9ff8a526036a3beeea299e156183b6a98070ffc68a23d191e1f24c577d7ea874f8cc27ce01f4dc832658b6 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
59-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
57+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \
58+
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
59+
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6060
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6161
else \
6262
echo \"pkg-oss tarball checksum verification failed!\"; \
6363
exit 1; \
6464
fi \
65-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
65+
&& tar xzvf 756.tar.gz \
66+
&& cd pkg-oss-756 \
6767
&& cd alpine \
6868
&& make module-perl \
6969
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine-slim/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN set -x \
2525
x86_64|aarch64) \
2626
# arches officially built by upstream
2727
set -x \
28-
&& KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \
28+
&& KEY_SHA512="e09fa32f0a0eab2b879ccbbc4d0e4fb9751486eedda75e35fac65802cc9faa266425edf83e261137a2f4d16281ce2c1a5f4502930fe75154723da014214f0655" \
2929
&& wget -O /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub \
30-
&& if [ "$(openssl rsa -pubin -in /tmp/nginx_signing.rsa.pub -text -noout | openssl sha512 -r)" = "$KEY_SHA512" ]; then \
30+
&& if echo "$KEY_SHA512 */tmp/nginx_signing.rsa.pub" | sha512sum -c -; then \
3131
echo "key verification succeeded!"; \
3232
mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/; \
3333
else \
@@ -56,16 +56,16 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"98d244d5dea3f0c49692843b1857e21dc7353e749f9ff8a526036a3beeea299e156183b6a98070ffc68a23d191e1f24c577d7ea874f8cc27ce01f4dc832658b6 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \
60+
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
61+
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \
6464
echo \"pkg-oss tarball checksum verification failed!\"; \
6565
exit 1; \
6666
fi \
67-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
67+
&& tar xzvf 756.tar.gz \
68+
&& cd pkg-oss-756 \
6969
&& cd alpine \
7070
&& make base \
7171
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
FROM nginx:1.23.2-alpine-slim
77

8-
ENV NJS_VERSION 0.7.7
8+
ENV NJS_VERSION 0.7.9
99

1010
RUN set -x \
1111
&& apkArch="$(cat /etc/apk/arch)" \
@@ -23,9 +23,9 @@ RUN set -x \
2323
x86_64|aarch64) \
2424
# arches officially built by upstream
2525
set -x \
26-
&& KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \
26+
&& KEY_SHA512="e09fa32f0a0eab2b879ccbbc4d0e4fb9751486eedda75e35fac65802cc9faa266425edf83e261137a2f4d16281ce2c1a5f4502930fe75154723da014214f0655" \
2727
&& wget -O /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub \
28-
&& if [ "$(openssl rsa -pubin -in /tmp/nginx_signing.rsa.pub -text -noout | openssl sha512 -r)" = "$KEY_SHA512" ]; then \
28+
&& if echo "$KEY_SHA512 */tmp/nginx_signing.rsa.pub" | sha512sum -c -; then \
2929
echo "key verification succeeded!"; \
3030
mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/; \
3131
else \
@@ -58,16 +58,16 @@ RUN set -x \
5858
&& su nobody -s /bin/sh -c " \
5959
export HOME=${tempDir} \
6060
&& cd ${tempDir} \
61-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62-
&& PKGOSSCHECKSUM=\"98d244d5dea3f0c49692843b1857e21dc7353e749f9ff8a526036a3beeea299e156183b6a98070ffc68a23d191e1f24c577d7ea874f8cc27ce01f4dc832658b6 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
63-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
61+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \
62+
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
63+
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6464
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6565
else \
6666
echo \"pkg-oss tarball checksum verification failed!\"; \
6767
exit 1; \
6868
fi \
69-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
70-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
69+
&& tar xzvf 756.tar.gz \
70+
&& cd pkg-oss-756 \
7171
&& cd alpine \
7272
&& make module-geoip module-image-filter module-njs module-xslt \
7373
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/debian/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM debian:bullseye-slim
88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

1010
ENV NGINX_VERSION 1.23.2
11-
ENV NJS_VERSION 0.7.7
11+
ENV NJS_VERSION 0.7.9
1212
ENV PKG_RELEASE 1~bullseye
1313

1414
RUN set -x \

‎stable/alpine-perl/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ RUN set -x \
2222
x86_64|aarch64) \
2323
# arches officially built by upstream
2424
set -x \
25-
&& KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \
25+
&& KEY_SHA512="e09fa32f0a0eab2b879ccbbc4d0e4fb9751486eedda75e35fac65802cc9faa266425edf83e261137a2f4d16281ce2c1a5f4502930fe75154723da014214f0655" \
2626
&& wget -O /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub \
27-
&& if [ "$(openssl rsa -pubin -in /tmp/nginx_signing.rsa.pub -text -noout | openssl sha512 -r)" = "$KEY_SHA512" ]; then \
27+
&& if echo "$KEY_SHA512 */tmp/nginx_signing.rsa.pub" | sha512sum -c -; then \
2828
echo "key verification succeeded!"; \
2929
mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/; \
3030
else \
@@ -54,16 +54,16 @@ RUN set -x \
5454
&& su nobody -s /bin/sh -c " \
5555
export HOME=${tempDir} \
5656
&& cd ${tempDir} \
57-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
58-
&& PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
59-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
57+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/757.tar.gz \
58+
&& PKGOSSCHECKSUM=\"32a039e8d3cc54404a8ad4a31981e76a49632f1ebec2f45bb309689d6ba2f82e3e8aea8abf582b49931636ea53271b48a7e2f2ef8ebe35b167b3fe18b8b99852 *757.tar.gz\" \
59+
&& if [ \"\$(openssl sha512 -r 757.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6060
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6161
else \
6262
echo \"pkg-oss tarball checksum verification failed!\"; \
6363
exit 1; \
6464
fi \
65-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
65+
&& tar xzvf 757.tar.gz \
66+
&& cd pkg-oss-757 \
6767
&& cd alpine \
6868
&& make module-perl \
6969
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine-slim/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN set -x \
2525
x86_64|aarch64) \
2626
# arches officially built by upstream
2727
set -x \
28-
&& KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \
28+
&& KEY_SHA512="e09fa32f0a0eab2b879ccbbc4d0e4fb9751486eedda75e35fac65802cc9faa266425edf83e261137a2f4d16281ce2c1a5f4502930fe75154723da014214f0655" \
2929
&& wget -O /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub \
30-
&& if [ "$(openssl rsa -pubin -in /tmp/nginx_signing.rsa.pub -text -noout | openssl sha512 -r)" = "$KEY_SHA512" ]; then \
30+
&& if echo "$KEY_SHA512 */tmp/nginx_signing.rsa.pub" | sha512sum -c -; then \
3131
echo "key verification succeeded!"; \
3232
mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/; \
3333
else \
@@ -56,16 +56,16 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/757.tar.gz \
60+
&& PKGOSSCHECKSUM=\"32a039e8d3cc54404a8ad4a31981e76a49632f1ebec2f45bb309689d6ba2f82e3e8aea8abf582b49931636ea53271b48a7e2f2ef8ebe35b167b3fe18b8b99852 *757.tar.gz\" \
61+
&& if [ \"\$(openssl sha512 -r 757.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \
6464
echo \"pkg-oss tarball checksum verification failed!\"; \
6565
exit 1; \
6666
fi \
67-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
67+
&& tar xzvf 757.tar.gz \
68+
&& cd pkg-oss-757 \
6969
&& cd alpine \
7070
&& make base \
7171
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
FROM nginx:1.22.1-alpine-slim
77

8-
ENV NJS_VERSION 0.7.7
8+
ENV NJS_VERSION 0.7.9
99

1010
RUN set -x \
1111
&& apkArch="$(cat /etc/apk/arch)" \
@@ -23,9 +23,9 @@ RUN set -x \
2323
x86_64|aarch64) \
2424
# arches officially built by upstream
2525
set -x \
26-
&& KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \
26+
&& KEY_SHA512="e09fa32f0a0eab2b879ccbbc4d0e4fb9751486eedda75e35fac65802cc9faa266425edf83e261137a2f4d16281ce2c1a5f4502930fe75154723da014214f0655" \
2727
&& wget -O /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub \
28-
&& if [ "$(openssl rsa -pubin -in /tmp/nginx_signing.rsa.pub -text -noout | openssl sha512 -r)" = "$KEY_SHA512" ]; then \
28+
&& if echo "$KEY_SHA512 */tmp/nginx_signing.rsa.pub" | sha512sum -c -; then \
2929
echo "key verification succeeded!"; \
3030
mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/; \
3131
else \
@@ -58,16 +58,16 @@ RUN set -x \
5858
&& su nobody -s /bin/sh -c " \
5959
export HOME=${tempDir} \
6060
&& cd ${tempDir} \
61-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62-
&& PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
63-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
61+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/757.tar.gz \
62+
&& PKGOSSCHECKSUM=\"32a039e8d3cc54404a8ad4a31981e76a49632f1ebec2f45bb309689d6ba2f82e3e8aea8abf582b49931636ea53271b48a7e2f2ef8ebe35b167b3fe18b8b99852 *757.tar.gz\" \
63+
&& if [ \"\$(openssl sha512 -r 757.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6464
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6565
else \
6666
echo \"pkg-oss tarball checksum verification failed!\"; \
6767
exit 1; \
6868
fi \
69-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
70-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
69+
&& tar xzvf 757.tar.gz \
70+
&& cd pkg-oss-757 \
7171
&& cd alpine \
7272
&& make module-geoip module-image-filter module-njs module-xslt \
7373
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/debian/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM debian:bullseye-slim
88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

1010
ENV NGINX_VERSION 1.22.1
11-
ENV NJS_VERSION 0.7.7
11+
ENV NJS_VERSION 0.7.9
1212
ENV PKG_RELEASE 1~bullseye
1313

1414
RUN set -x \

0 commit comments

Comments
 (0)