Skip to content

Commit bf443c0

Browse files
alessfgalessfg
committed
Update mainline NGINX to 1.27.0
* And update stable NGINX to 1.26.1
1 parent 7ebc14d commit bf443c0

File tree

11 files changed

+55
-55
lines changed

11 files changed

+55
-55
lines changed

‎mainline/alpine-perl/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.5-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.0-alpine
77
FROM $IMAGE
88

99
ARG UID=101
@@ -50,16 +50,16 @@ RUN set -x \
5050
&& su nobody -s /bin/sh -c " \
5151
export HOME=${tempDir} \
5252
&& cd ${tempDir} \
53-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
54-
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
55-
&& if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
53+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
54+
&& PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
55+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5656
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5757
else \
5858
echo \"pkg-oss tarball checksum verification failed!\"; \
5959
exit 1; \
6060
fi \
61-
&& tar xzvf 27357d6c5453.tar.gz \
62-
&& cd pkg-oss-27357d6c5453 \
61+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6363
&& cd alpine \
6464
&& make module-perl \
6565
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine-slim/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

11-
ENV NGINX_VERSION 1.25.5
12-
ENV PKG_RELEASE 1
11+
ENV NGINX_VERSION 1.27.0
12+
ENV PKG_RELEASE 2
1313

1414
ARG UID=101
1515
ARG GID=101
@@ -60,16 +60,16 @@ RUN set -x \
6060
&& su nobody -s /bin/sh -c " \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
63-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
64-
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64+
&& PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \
6868
echo \"pkg-oss tarball checksum verification failed!\"; \
6969
exit 1; \
7070
fi \
71-
&& tar xzvf 27357d6c5453.tar.gz \
72-
&& cd pkg-oss-27357d6c5453 \
71+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7373
&& cd alpine \
7474
&& make base \
7575
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.5-alpine-slim
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.0-alpine-slim
77
FROM $IMAGE
88

99
ENV NJS_VERSION 0.8.4
10-
ENV NJS_RELEASE 3
10+
ENV NJS_RELEASE 2
1111

1212
ARG UID=101
1313
ARG GID=101
@@ -55,16 +55,16 @@ RUN set -x \
5555
&& su nobody -s /bin/sh -c " \
5656
export HOME=${tempDir} \
5757
&& cd ${tempDir} \
58-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
59-
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
60-
&& if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
58+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
59+
&& PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6161
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6262
else \
6363
echo \"pkg-oss tarball checksum verification failed!\"; \
6464
exit 1; \
6565
fi \
66-
&& tar xzvf 27357d6c5453.tar.gz \
67-
&& cd pkg-oss-27357d6c5453 \
66+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
67+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6868
&& cd alpine \
6969
&& make module-geoip module-image-filter module-njs module-xslt \
7070
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/debian-perl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.5
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.0
77
FROM $IMAGE
88

99
ARG UID=101

‎mainline/debian/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

11-
ENV NGINX_VERSION 1.25.5
11+
ENV NGINX_VERSION 1.27.0
1212
ENV NJS_VERSION 0.8.4
13-
ENV NJS_RELEASE 3~bookworm
14-
ENV PKG_RELEASE 1~bookworm
13+
ENV NJS_RELEASE 2~bookworm
14+
ENV PKG_RELEASE 2~bookworm
1515

1616
ARG UID=101
1717
ARG GID=101

‎stable/alpine-perl/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.26.0-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.26.1-alpine
77
FROM $IMAGE
88

99
ARG UID=101
@@ -50,16 +50,16 @@ RUN set -x \
5050
&& su nobody -s /bin/sh -c " \
5151
export HOME=${tempDir} \
5252
&& cd ${tempDir} \
53-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
54-
&& PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
55-
&& if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
53+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
54+
&& PKGOSSCHECKSUM=\"0db2bf5f86e7c31f23d0e3e7699a5d8a4d9d9b0dc2f98d3e3a31e004df20206270debf6502e4481892e8b64d55fba73fcc8d74c3e0ddfcd2d3f85a17fa02a25e *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
55+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5656
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5757
else \
5858
echo \"pkg-oss tarball checksum verification failed!\"; \
5959
exit 1; \
6060
fi \
61-
&& tar xzvf 73d6839714a2.tar.gz \
62-
&& cd pkg-oss-73d6839714a2 \
61+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6363
&& cd alpine \
6464
&& make module-perl \
6565
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine-slim/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

11-
ENV NGINX_VERSION 1.26.0
12-
ENV PKG_RELEASE 1
11+
ENV NGINX_VERSION 1.26.1
12+
ENV PKG_RELEASE 2
1313

1414
ARG UID=101
1515
ARG GID=101
@@ -60,16 +60,16 @@ RUN set -x \
6060
&& su nobody -s /bin/sh -c " \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
63-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
64-
&& PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64+
&& PKGOSSCHECKSUM=\"0db2bf5f86e7c31f23d0e3e7699a5d8a4d9d9b0dc2f98d3e3a31e004df20206270debf6502e4481892e8b64d55fba73fcc8d74c3e0ddfcd2d3f85a17fa02a25e *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \
6868
echo \"pkg-oss tarball checksum verification failed!\"; \
6969
exit 1; \
7070
fi \
71-
&& tar xzvf 73d6839714a2.tar.gz \
72-
&& cd pkg-oss-73d6839714a2 \
71+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7373
&& cd alpine \
7474
&& make base \
7575
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.26.0-alpine-slim
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.26.1-alpine-slim
77
FROM $IMAGE
88

99
ENV NJS_VERSION 0.8.4
@@ -55,16 +55,16 @@ RUN set -x \
5555
&& su nobody -s /bin/sh -c " \
5656
export HOME=${tempDir} \
5757
&& cd ${tempDir} \
58-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
59-
&& PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
60-
&& if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
58+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
59+
&& PKGOSSCHECKSUM=\"0db2bf5f86e7c31f23d0e3e7699a5d8a4d9d9b0dc2f98d3e3a31e004df20206270debf6502e4481892e8b64d55fba73fcc8d74c3e0ddfcd2d3f85a17fa02a25e *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6161
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6262
else \
6363
echo \"pkg-oss tarball checksum verification failed!\"; \
6464
exit 1; \
6565
fi \
66-
&& tar xzvf 73d6839714a2.tar.gz \
67-
&& cd pkg-oss-73d6839714a2 \
66+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
67+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6868
&& cd alpine \
6969
&& make module-geoip module-image-filter module-njs module-xslt \
7070
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/debian-perl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.26.0
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.26.1
77
FROM $IMAGE
88

99
ARG UID=101

‎stable/debian/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

11-
ENV NGINX_VERSION 1.26.0
11+
ENV NGINX_VERSION 1.26.1
1212
ENV NJS_VERSION 0.8.4
1313
ENV NJS_RELEASE 2~bookworm
14-
ENV PKG_RELEASE 1~bookworm
14+
ENV PKG_RELEASE 2~bookworm
1515

1616
ARG UID=101
1717
ARG GID=101

‎update.sh

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ declare branches=(
1212
# Current nginx versions
1313
# Remember to update pkgosschecksum when changing this.
1414
declare -A nginx=(
15-
[mainline]='1.25.5'
16-
[stable]='1.26.0'
15+
[mainline]='1.27.0'
16+
[stable]='1.26.1'
1717
)
1818

1919
# Current njs versions
@@ -25,15 +25,15 @@ declare -A njs=(
2525
# Current njs patchlevel version
2626
# Remember to update pkgosschecksum when changing this.
2727
declare -A njspkg=(
28-
[mainline]='3'
28+
[mainline]='2'
2929
[stable]='2'
3030
)
3131

3232
# Current package patchlevel version
3333
# Remember to update pkgosschecksum when changing this.
3434
declare -A pkg=(
35-
[mainline]=1
36-
[stable]=1
35+
[mainline]=2
36+
[stable]=2
3737
)
3838

3939
declare -A debian=(
@@ -51,16 +51,16 @@ declare -A alpine=(
5151
# when building alpine packages on architectures not supported by nginx.org
5252
# Remember to update pkgosschecksum when changing this.
5353
declare -A rev=(
54-
[mainline]='27357d6c5453'
55-
[stable]='73d6839714a2'
54+
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
55+
[stable]='${NGINX_VERSION}-${PKG_RELEASE}'
5656
)
5757

5858
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
5959
# revision/tag in the previous block
6060
# Used in alpine builds for architectures not packaged by nginx.org
6161
declare -A pkgosschecksum=(
62-
[mainline]='a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0'
63-
[stable]='95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db'
62+
[mainline]='cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0'
63+
[stable]='0db2bf5f86e7c31f23d0e3e7699a5d8a4d9d9b0dc2f98d3e3a31e004df20206270debf6502e4481892e8b64d55fba73fcc8d74c3e0ddfcd2d3f85a17fa02a25e'
6464
)
6565

6666
get_packages() {

0 commit comments

Comments
 (0)