Skip to content

Commit 29d5001

Browse files
oxpaoxpa
committed
Updated mainline to 1.25.5.
1 parent 9cb2788 commit 29d5001

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

‎mainline/alpine-otel/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM nginx:1.25.4-alpine
6+
FROM nginx:1.25.5-alpine
77

88
ENV OTEL_VERSION 0.1.0
99

@@ -60,7 +60,7 @@ RUN set -x \
6060
export HOME=${tempDir} \
6161
&& cd ${tempDir} \
6262
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
63-
&& PKGOSSCHECKSUM=\"79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
63+
&& PKGOSSCHECKSUM=\"74000f32ab250be492a8ae4d408cd63a4c422f4f0af84689973a2844fceeb8a3e7e12b04d7c6dac0f993d7102d920a5f60e6f49be23ce4093f48a8eb1ae36ce5 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6464
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6565
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6666
else \

‎mainline/alpine-perl/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM nginx:1.25.4-alpine
6+
FROM nginx:1.25.5-alpine
77

88
RUN set -x \
99
&& apkArch="$(cat /etc/apk/arch)" \
@@ -55,7 +55,7 @@ RUN set -x \
5555
export HOME=${tempDir} \
5656
&& cd ${tempDir} \
5757
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
58-
&& PKGOSSCHECKSUM=\"79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
58+
&& PKGOSSCHECKSUM=\"74000f32ab250be492a8ae4d408cd63a4c422f4f0af84689973a2844fceeb8a3e7e12b04d7c6dac0f993d7102d920a5f60e6f49be23ce4093f48a8eb1ae36ce5 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5959
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6060
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6161
else \

‎mainline/alpine-slim/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM alpine:3.18
6+
FROM alpine:3.19
77

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

10-
ENV NGINX_VERSION 1.25.4
10+
ENV NGINX_VERSION 1.25.5
1111
ENV PKG_RELEASE 1
1212

1313
RUN set -x \
@@ -57,7 +57,7 @@ RUN set -x \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
5959
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60+
&& PKGOSSCHECKSUM=\"74000f32ab250be492a8ae4d408cd63a4c422f4f0af84689973a2844fceeb8a3e7e12b04d7c6dac0f993d7102d920a5f60e6f49be23ce4093f48a8eb1ae36ce5 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6161
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \

‎mainline/alpine/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM nginx:1.25.4-alpine-slim
6+
FROM nginx:1.25.5-alpine-slim
77

8-
ENV NJS_VERSION 0.8.3
8+
ENV NJS_VERSION 0.8.4
99

1010
RUN set -x \
1111
&& apkArch="$(cat /etc/apk/arch)" \
@@ -59,7 +59,7 @@ RUN set -x \
5959
export HOME=${tempDir} \
6060
&& cd ${tempDir} \
6161
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62-
&& PKGOSSCHECKSUM=\"79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
62+
&& PKGOSSCHECKSUM=\"74000f32ab250be492a8ae4d408cd63a4c422f4f0af84689973a2844fceeb8a3e7e12b04d7c6dac0f993d7102d920a5f60e6f49be23ce4093f48a8eb1ae36ce5 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6363
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6464
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6565
else \

‎mainline/debian-otel/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-
FROM nginx:1.25.4
6+
FROM nginx:1.25.5
77

88
ENV OTEL_VERSION 0.1.0
99

‎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-
FROM nginx:1.25.4
6+
FROM nginx:1.25.5
77

88
RUN set -x \
99
&& apt-get update \

‎mainline/debian/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ FROM debian:bookworm-slim
77

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

10-
ENV NGINX_VERSION 1.25.4
11-
ENV NJS_VERSION 0.8.3
10+
ENV NGINX_VERSION 1.25.5
11+
ENV NJS_VERSION 0.8.4
1212
ENV PKG_RELEASE 1~bookworm
1313

1414
RUN set -x \

‎update.sh

+4-4
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.4'
15+
[mainline]='1.25.5'
1616
[stable]='1.24.0'
1717
)
1818

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

@@ -41,7 +41,7 @@ declare -A debian=(
4141
)
4242

4343
declare -A alpine=(
44-
[mainline]='3.18'
44+
[mainline]='3.19'
4545
[stable]='3.18'
4646
)
4747

@@ -58,7 +58,7 @@ declare -A rev=(
5858
# revision/tag in the previous block
5959
# Used in alpine builds for architectures not packaged by nginx.org
6060
declare -A pkgosschecksum=(
61-
[mainline]='79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3'
61+
[mainline]='74000f32ab250be492a8ae4d408cd63a4c422f4f0af84689973a2844fceeb8a3e7e12b04d7c6dac0f993d7102d920a5f60e6f49be23ce4093f48a8eb1ae36ce5'
6262
[stable]='4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b'
6363
)
6464

0 commit comments

Comments
 (0)