Skip to content

Commit 0ee9425

Browse files
alessfgalessfg
committed
Update mainline NGINX to 1.25.2
1 parent 3a95eb5 commit 0ee9425

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 6 additions & 6 deletions
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.1-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.2-alpine
77
FROM $IMAGE
88

99
ARG UID=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/e0da7da2b70a.tar.gz \
64-
&& PKGOSSCHECKSUM=\"147d7cce3f47d4dbd7bbce8da3199943e15ba64d4be44f603bd90286f8d38320ad027bfa8506a00ca84964b763c19c4ab1d504f586cfc7798518df97700ab1a3 *e0da7da2b70a.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r e0da7da2b70a.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64+
&& PKGOSSCHECKSUM=\"64d3f504b246df1997d8442b12303944d2f51e09b35443b23da479af7790b9f84cf2ddf8ba108bdd712f92466f9a8e107b865a488f0898b87d39059f9f7ff56c *${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 e0da7da2b70a.tar.gz \
72-
&& cd pkg-oss-e0da7da2b70a \
71+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7373
&& cd alpine \
7474
&& make module-perl \
7575
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine-slim/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.25.1
11+
ENV NGINX_VERSION 1.25.2
1212
ENV PKG_RELEASE 1
1313

1414
ARG UID=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/e0da7da2b70a.tar.gz \
64-
&& PKGOSSCHECKSUM=\"147d7cce3f47d4dbd7bbce8da3199943e15ba64d4be44f603bd90286f8d38320ad027bfa8506a00ca84964b763c19c4ab1d504f586cfc7798518df97700ab1a3 *e0da7da2b70a.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r e0da7da2b70a.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64+
&& PKGOSSCHECKSUM=\"64d3f504b246df1997d8442b12303944d2f51e09b35443b23da479af7790b9f84cf2ddf8ba108bdd712f92466f9a8e107b865a488f0898b87d39059f9f7ff56c *${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 e0da7da2b70a.tar.gz \
72-
&& cd pkg-oss-e0da7da2b70a \
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‎

Lines changed: 6 additions & 6 deletions
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.1-alpine-slim
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.2-alpine-slim
77
FROM $IMAGE
88

99
ENV NJS_VERSION 0.8.0
@@ -64,16 +64,16 @@ RUN set -x \
6464
&& su nobody -s /bin/sh -c " \
6565
export HOME=${tempDir} \
6666
&& cd ${tempDir} \
67-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/e0da7da2b70a.tar.gz \
68-
&& PKGOSSCHECKSUM=\"147d7cce3f47d4dbd7bbce8da3199943e15ba64d4be44f603bd90286f8d38320ad027bfa8506a00ca84964b763c19c4ab1d504f586cfc7798518df97700ab1a3 *e0da7da2b70a.tar.gz\" \
69-
&& if [ \"\$(openssl sha512 -r e0da7da2b70a.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
67+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68+
&& PKGOSSCHECKSUM=\"64d3f504b246df1997d8442b12303944d2f51e09b35443b23da479af7790b9f84cf2ddf8ba108bdd712f92466f9a8e107b865a488f0898b87d39059f9f7ff56c *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
69+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7070
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7171
else \
7272
echo \"pkg-oss tarball checksum verification failed!\"; \
7373
exit 1; \
7474
fi \
75-
&& tar xzvf e0da7da2b70a.tar.gz \
76-
&& cd pkg-oss-e0da7da2b70a \
75+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
76+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7777
&& cd alpine \
7878
&& make module-geoip module-image-filter module-njs module-xslt \
7979
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/debian-perl/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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.1
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.2
77
FROM $IMAGE
88

99
ARG UID=101

‎mainline/debian/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.25.1
11+
ENV NGINX_VERSION 1.25.2
1212
ENV NJS_VERSION 0.8.0
1313
ENV PKG_RELEASE 1~bookworm
1414

‎update.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ declare branches=(
1212
# Current nginx versions
1313
# Remember to update pkgosschecksum when changing this.
1414
declare -A nginx=(
15-
[mainline]='1.25.1'
15+
[mainline]='1.25.2'
1616
[stable]='1.24.0'
1717
)
1818

@@ -44,15 +44,15 @@ declare -A alpine=(
4444
# when building alpine packages on architectures not supported by nginx.org
4545
# Remember to update pkgosschecksum when changing this.
4646
declare -A rev=(
47-
[mainline]='e0da7da2b70a'
47+
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
4848
[stable]='e5d85b3424bb'
4949
)
5050

5151
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
5252
# revision/tag in the previous block
5353
# Used in alpine builds for architectures not packaged by nginx.org
5454
declare -A pkgosschecksum=(
55-
[mainline]='147d7cce3f47d4dbd7bbce8da3199943e15ba64d4be44f603bd90286f8d38320ad027bfa8506a00ca84964b763c19c4ab1d504f586cfc7798518df97700ab1a3'
55+
[mainline]='64d3f504b246df1997d8442b12303944d2f51e09b35443b23da479af7790b9f84cf2ddf8ba108bdd712f92466f9a8e107b865a488f0898b87d39059f9f7ff56c'
5656
[stable]='4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b'
5757
)
5858

0 commit comments

Comments
 (0)