Skip to content

Commit 3180cdb

Browse files
thresheekthresheek
committed
Regenerated after last commits
1 parent b5e8310 commit 3180cdb

File tree

14 files changed

+60
-60
lines changed

14 files changed

+60
-60
lines changed

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

88
ENV OTEL_VERSION 0.1.0
99

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

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

88
RUN set -x \
99
&& apkArch="$(cat /etc/apk/arch)" \
@@ -44,16 +44,16 @@ RUN set -x \
4444
&& su nobody -s /bin/sh -c " \
4545
export HOME=${tempDir} \
4646
&& cd ${tempDir} \
47-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
48-
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
49-
&& if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
47+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
48+
&& PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
49+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5050
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5151
else \
5252
echo \"pkg-oss tarball checksum verification failed!\"; \
5353
exit 1; \
5454
fi \
55-
&& tar xzvf 27357d6c5453.tar.gz \
56-
&& cd pkg-oss-27357d6c5453 \
55+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
56+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
5757
&& cd alpine \
5858
&& make module-perl \
5959
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine-slim/Dockerfile‎

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

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

10-
ENV NGINX_VERSION 1.25.5
11-
ENV PKG_RELEASE 1
10+
ENV NGINX_VERSION 1.27.0
11+
ENV PKG_RELEASE 2
1212

1313
RUN set -x \
1414
# create nginx user/group first, to be consistent throughout docker variants
@@ -56,16 +56,16 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
60-
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60+
&& PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
61+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \
6464
echo \"pkg-oss tarball checksum verification failed!\"; \
6565
exit 1; \
6666
fi \
67-
&& tar xzvf 27357d6c5453.tar.gz \
68-
&& cd pkg-oss-27357d6c5453 \
67+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6969
&& cd alpine \
7070
&& make base \
7171
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM nginx:1.25.5-alpine-slim
6+
FROM nginx:1.27.0-alpine-slim
77

88
ENV NJS_VERSION 0.8.4
9-
ENV NJS_RELEASE 3
9+
ENV NJS_RELEASE 2
1010

1111
RUN set -x \
1212
&& apkArch="$(cat /etc/apk/arch)" \
@@ -49,16 +49,16 @@ RUN set -x \
4949
&& su nobody -s /bin/sh -c " \
5050
export HOME=${tempDir} \
5151
&& cd ${tempDir} \
52-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/27357d6c5453.tar.gz \
53-
&& PKGOSSCHECKSUM=\"a80fc5706ad8e98597478b9e041f658375d53d22f7c8004dd16354067a3d48eb4ef234830b697ddf5c45ec57b837237cc11317bcaaa5133ccbe71bce15d969b0 *27357d6c5453.tar.gz\" \
54-
&& if [ \"\$(openssl sha512 -r 27357d6c5453.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
52+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
53+
&& PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
54+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5555
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5656
else \
5757
echo \"pkg-oss tarball checksum verification failed!\"; \
5858
exit 1; \
5959
fi \
60-
&& tar xzvf 27357d6c5453.tar.gz \
61-
&& cd pkg-oss-27357d6c5453 \
60+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
61+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6262
&& cd alpine \
6363
&& make module-geoip module-image-filter module-njs module-xslt \
6464
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

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

88
ENV OTEL_VERSION 0.1.0
99

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

88
RUN set -x; \
99
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \

‎mainline/debian/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ FROM debian:bookworm-slim
77

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

10-
ENV NGINX_VERSION 1.25.5
10+
ENV NGINX_VERSION 1.27.0
1111
ENV NJS_VERSION 0.8.4
12-
ENV NJS_RELEASE 3~bookworm
13-
ENV PKG_RELEASE 1~bookworm
12+
ENV NJS_RELEASE 2~bookworm
13+
ENV PKG_RELEASE 2~bookworm
1414

1515
RUN set -x \
1616
# create nginx user/group first, to be consistent throughout docker variants

‎stable/alpine-otel/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-
FROM nginx:1.26.0-alpine
6+
FROM nginx:1.26.1-alpine
77

88
ENV OTEL_VERSION 0.1.0
99

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

‎stable/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-
FROM nginx:1.26.0-alpine
6+
FROM nginx:1.26.1-alpine
77

88
RUN set -x \
99
&& apkArch="$(cat /etc/apk/arch)" \
@@ -44,16 +44,16 @@ RUN set -x \
4444
&& su nobody -s /bin/sh -c " \
4545
export HOME=${tempDir} \
4646
&& cd ${tempDir} \
47-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
48-
&& PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
49-
&& if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
47+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
48+
&& PKGOSSCHECKSUM=\"0db2bf5f86e7c31f23d0e3e7699a5d8a4d9d9b0dc2f98d3e3a31e004df20206270debf6502e4481892e8b64d55fba73fcc8d74c3e0ddfcd2d3f85a17fa02a25e *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
49+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5050
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5151
else \
5252
echo \"pkg-oss tarball checksum verification failed!\"; \
5353
exit 1; \
5454
fi \
55-
&& tar xzvf 73d6839714a2.tar.gz \
56-
&& cd pkg-oss-73d6839714a2 \
55+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
56+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
5757
&& cd alpine \
5858
&& make module-perl \
5959
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine-slim/Dockerfile‎

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

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

10-
ENV NGINX_VERSION 1.26.0
11-
ENV PKG_RELEASE 1
10+
ENV NGINX_VERSION 1.26.1
11+
ENV PKG_RELEASE 2
1212

1313
RUN set -x \
1414
# create nginx user/group first, to be consistent throughout docker variants
@@ -56,16 +56,16 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/73d6839714a2.tar.gz \
60-
&& PKGOSSCHECKSUM=\"95d513d058493d60cba5a6bb328dc3c3e75ea115cf248a64bd921159e11c6fc87d33c7f058562c584fe440a219b931d53fd66bd4c596244b54287b62979834db *73d6839714a2.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r 73d6839714a2.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60+
&& PKGOSSCHECKSUM=\"0db2bf5f86e7c31f23d0e3e7699a5d8a4d9d9b0dc2f98d3e3a31e004df20206270debf6502e4481892e8b64d55fba73fcc8d74c3e0ddfcd2d3f85a17fa02a25e *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
61+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \
6464
echo \"pkg-oss tarball checksum verification failed!\"; \
6565
exit 1; \
6666
fi \
67-
&& tar xzvf 73d6839714a2.tar.gz \
68-
&& cd pkg-oss-73d6839714a2 \
67+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6969
&& cd alpine \
7070
&& make base \
7171
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

0 commit comments

Comments
 (0)