Skip to content

Commit f827f3d

Browse files
authored
Update mainline NGINX to 1.25.4 (#190)
* And mainline NJS to 0.8.3
1 parent 3122299 commit f827f3d

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

mainline/alpine-perl/Dockerfile

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

99
ARG UID=101
@@ -61,7 +61,7 @@ RUN set -x \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
6363
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"00b217979265cc9d66c991c9c89427558936dbaa568d175ca45780589171d94f1866217be09a83438d95494cf38baaa6788320f6d8d23f2fb29c03117391ff88 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
64+
&& PKGOSSCHECKSUM=\"79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6565
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \

mainline/alpine-slim/Dockerfile

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

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

11-
ENV NGINX_VERSION 1.25.3
11+
ENV NGINX_VERSION 1.25.4
1212
ENV PKG_RELEASE 1
1313

1414
ARG UID=101
@@ -61,7 +61,7 @@ RUN set -x \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
6363
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"00b217979265cc9d66c991c9c89427558936dbaa568d175ca45780589171d94f1866217be09a83438d95494cf38baaa6788320f6d8d23f2fb29c03117391ff88 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
64+
&& PKGOSSCHECKSUM=\"79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6565
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \

mainline/alpine/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.3-alpine-slim
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.4-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION 0.8.2
9+
ENV NJS_VERSION 0.8.3
1010

1111
ARG UID=101
1212
ARG GID=101
@@ -65,7 +65,7 @@ RUN set -x \
6565
export HOME=${tempDir} \
6666
&& cd ${tempDir} \
6767
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68-
&& PKGOSSCHECKSUM=\"00b217979265cc9d66c991c9c89427558936dbaa568d175ca45780589171d94f1866217be09a83438d95494cf38baaa6788320f6d8d23f2fb29c03117391ff88 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
68+
&& PKGOSSCHECKSUM=\"79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6969
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7070
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7171
else \

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.3
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.4
77
FROM $IMAGE
88

99
ARG UID=101

mainline/debian/Dockerfile

Lines changed: 2 additions & 2 deletions
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.3
12-
ENV NJS_VERSION 0.8.2
11+
ENV NGINX_VERSION 1.25.4
12+
ENV NJS_VERSION 0.8.3
1313
ENV PKG_RELEASE 1~bookworm
1414

1515
ARG UID=101

update.sh

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

1919
# Current njs versions
2020
declare -A njs=(
21-
[mainline]='0.8.2'
21+
[mainline]='0.8.3'
2222
[stable]='0.8.0'
2323
)
2424

@@ -52,7 +52,7 @@ declare -A rev=(
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]='00b217979265cc9d66c991c9c89427558936dbaa568d175ca45780589171d94f1866217be09a83438d95494cf38baaa6788320f6d8d23f2fb29c03117391ff88'
55+
[mainline]='79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3'
5656
[stable]='4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b'
5757
)
5858

0 commit comments

Comments
 (0)