Skip to content

Commit eaf8875

Browse files
oxpaoxpa
committed
Updated mainline to 1.27.5.
While at it, updated njs to 0.8.10 for mainline.
1 parent bd3e501 commit eaf8875

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

‎mainline/alpine-otel/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-
FROM nginx:1.27.4-alpine
6+
FROM nginx:1.27.5-alpine
77

88
ENV OTEL_VERSION 0.1.1
99

@@ -51,7 +51,7 @@ RUN set -x \
5151
export HOME=${tempDir} \
5252
&& cd ${tempDir} \
5353
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
54-
&& PKGOSSCHECKSUM=\"973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
54+
&& PKGOSSCHECKSUM=\"c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5555
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5656
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5757
else \

‎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-
FROM nginx:1.27.4-alpine
6+
FROM nginx:1.27.5-alpine
77

88
RUN set -x \
99
&& apkArch="$(cat /etc/apk/arch)" \
@@ -46,7 +46,7 @@ RUN set -x \
4646
export HOME=${tempDir} \
4747
&& cd ${tempDir} \
4848
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
49-
&& PKGOSSCHECKSUM=\"973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
49+
&& PKGOSSCHECKSUM=\"c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5050
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5151
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5252
else \

‎mainline/alpine-slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM alpine:3.21
77

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

10-
ENV NGINX_VERSION 1.27.4
10+
ENV NGINX_VERSION 1.27.5
1111
ENV PKG_RELEASE 1
1212
ENV DYNPKG_RELEASE 1
1313

@@ -59,7 +59,7 @@ RUN set -x \
5959
export HOME=${tempDir} \
6060
&& cd ${tempDir} \
6161
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62-
&& PKGOSSCHECKSUM=\"973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
62+
&& PKGOSSCHECKSUM=\"c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${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/alpine/Dockerfile

Lines changed: 3 additions & 3 deletions
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.27.4-alpine-slim
6+
FROM nginx:1.27.5-alpine-slim
77

8-
ENV NJS_VERSION 0.8.9
8+
ENV NJS_VERSION 0.8.10
99
ENV NJS_RELEASE 1
1010

1111
RUN set -x \
@@ -51,7 +51,7 @@ RUN set -x \
5151
export HOME=${tempDir} \
5252
&& cd ${tempDir} \
5353
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
54-
&& PKGOSSCHECKSUM=\"973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
54+
&& PKGOSSCHECKSUM=\"c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5555
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5656
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5757
else \

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

88
ENV OTEL_VERSION 0.1.1
99

@@ -50,7 +50,7 @@ RUN set -x; \
5050
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
5151
&& REVISION=${REVISION%~*} \
5252
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
53-
&& PKGOSSCHECKSUM="973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${REVISION}.tar.gz" \
53+
&& PKGOSSCHECKSUM="c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${REVISION}.tar.gz" \
5454
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
5555
echo "pkg-oss tarball checksum verification succeeded!"; \
5656
else \

‎mainline/debian-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-
FROM nginx:1.27.4
6+
FROM nginx:1.27.5
77

88
RUN set -x; \
99
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
@@ -48,7 +48,7 @@ RUN set -x; \
4848
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
4949
&& REVISION=${REVISION%~*} \
5050
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
51-
&& PKGOSSCHECKSUM="973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${REVISION}.tar.gz" \
51+
&& PKGOSSCHECKSUM="c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${REVISION}.tar.gz" \
5252
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
5353
echo "pkg-oss tarball checksum verification succeeded!"; \
5454
else \

‎mainline/debian/Dockerfile

Lines changed: 3 additions & 3 deletions
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.27.4
11-
ENV NJS_VERSION 0.8.9
10+
ENV NGINX_VERSION 1.27.5
11+
ENV NJS_VERSION 0.8.10
1212
ENV NJS_RELEASE 1~bookworm
1313
ENV PKG_RELEASE 1~bookworm
1414
ENV DYNPKG_RELEASE 1~bookworm
@@ -77,7 +77,7 @@ RUN set -x \
7777
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
7878
&& REVISION=${REVISION%~*} \
7979
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
80-
&& PKGOSSCHECKSUM="973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${REVISION}.tar.gz" \
80+
&& PKGOSSCHECKSUM="c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${REVISION}.tar.gz" \
8181
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
8282
echo "pkg-oss tarball checksum verification succeeded!"; \
8383
else \

‎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.27.4'
15+
[mainline]='1.27.5'
1616
[stable]='1.26.3'
1717
)
1818

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

@@ -72,7 +72,7 @@ declare -A rev=(
7272
# revision/tag in the previous block
7373
# Used in builds for architectures not packaged by nginx.org
7474
declare -A pkgosschecksum=(
75-
[mainline]='973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845'
75+
[mainline]='c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745'
7676
[stable]='3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea'
7777
)
7878

0 commit comments

Comments
 (0)