Skip to content

Commit e78cf70

Browse files
Your Namethresheek
Your Name
authored and
thresheek
committed
Run update.sh to pick up changes after previous commit.
1 parent 0eef651 commit e78cf70

File tree

14 files changed

+82
-78
lines changed

14 files changed

+82
-78
lines changed

‎mainline/alpine-otel/Dockerfile

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

88
ENV OTEL_VERSION 0.1.0
99

1010
RUN set -x \
1111
&& apkArch="$(cat /etc/apk/arch)" \
1212
&& nginxPackages=" \
1313
nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
14-
nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
15-
nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
16-
nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
14+
nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
15+
nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
16+
nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
1717
nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
1818
nginx-module-otel=${NGINX_VERSION}.${OTEL_VERSION}-r${PKG_RELEASE} \
1919
" \
@@ -50,7 +50,7 @@ RUN set -x \
5050
export HOME=${tempDir} \
5151
&& cd ${tempDir} \
5252
&& 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\" \
53+
&& PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5454
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5555
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5656
else \

‎mainline/alpine-perl/Dockerfile

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

88
RUN set -x \
99
&& apkArch="$(cat /etc/apk/arch)" \
1010
&& nginxPackages=" \
1111
nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
12-
nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
13-
nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
14-
nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
15-
nginx-module-perl=${NGINX_VERSION}-r${PKG_RELEASE} \
12+
nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
13+
nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
14+
nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
15+
nginx-module-perl=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
1616
nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
1717
" \
1818
# install prerequisites for public key and pkg-oss checks
@@ -45,7 +45,7 @@ RUN set -x \
4545
export HOME=${tempDir} \
4646
&& cd ${tempDir} \
4747
&& 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\" \
48+
&& PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
4949
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5050
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5151
else \

‎mainline/alpine-slim/Dockerfile

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

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

10-
ENV NGINX_VERSION 1.27.0
11-
ENV PKG_RELEASE 2
10+
ENV NGINX_VERSION 1.27.1
11+
ENV PKG_RELEASE 1
12+
ENV DYNPKG_RELEASE 2
1213

1314
RUN set -x \
1415
# create nginx user/group first, to be consistent throughout docker variants
@@ -57,7 +58,7 @@ RUN set -x \
5758
export HOME=${tempDir} \
5859
&& cd ${tempDir} \
5960
&& 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+
&& PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6162
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6263
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6364
else \

‎mainline/alpine/Dockerfile

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

8-
ENV NJS_VERSION 0.8.4
9-
ENV NJS_RELEASE 2
8+
ENV NJS_VERSION 0.8.5
9+
ENV NJS_RELEASE 1
1010

1111
RUN set -x \
1212
&& apkArch="$(cat /etc/apk/arch)" \
1313
&& nginxPackages=" \
1414
nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
15-
nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
16-
nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
17-
nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
15+
nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
16+
nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
17+
nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
1818
nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
1919
" \
2020
# install prerequisites for public key and pkg-oss checks
@@ -50,7 +50,7 @@ RUN set -x \
5050
export HOME=${tempDir} \
5151
&& cd ${tempDir} \
5252
&& 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\" \
53+
&& PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5454
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5555
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5656
else \

‎mainline/debian-otel/Dockerfile

Lines changed: 4 additions & 4 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.0
6+
FROM nginx:1.27.1
77

88
ENV OTEL_VERSION 0.1.0
99

@@ -12,9 +12,9 @@ RUN set -x; \
1212
dpkgArch="$(dpkg --print-architecture)" \
1313
&& nginxPackages=" \
1414
nginx=${NGINX_VERSION}-${PKG_RELEASE} \
15-
nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
16-
nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
17-
nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
15+
nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
16+
nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
17+
nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
1818
nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
1919
nginx-module-otel=${NGINX_VERSION}+${OTEL_VERSION}-${PKG_RELEASE} \
2020
" \

‎mainline/debian-perl/Dockerfile

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

88
RUN set -x; \
99
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
1010
dpkgArch="$(dpkg --print-architecture)" \
1111
&& nginxPackages=" \
1212
nginx=${NGINX_VERSION}-${PKG_RELEASE} \
13-
nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
14-
nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
15-
nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
16-
nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
13+
nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
14+
nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
15+
nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
16+
nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
1717
nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
1818
" \
1919
&& case "$dpkgArch" in \
@@ -37,11 +37,11 @@ RUN set -x; \
3737
\
3838
# build .deb files from upstream's source packages (which are verified by apt-get)
3939
&& apt-get update \
40-
&& apt-get build-dep -y nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
40+
&& apt-get build-dep -y nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
4141
&& ( \
4242
cd "$tempDir" \
4343
&& DEB_BUILD_OPTIONS="nocheck parallel=$(nproc)" \
44-
apt-get source --compile nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
44+
apt-get source --compile nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
4545
) \
4646
# we don't remove APT lists here because they get re-downloaded and removed later
4747
\

‎mainline/debian/Dockerfile

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

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

10-
ENV NGINX_VERSION 1.27.0
11-
ENV NJS_VERSION 0.8.4
12-
ENV NJS_RELEASE 2~bookworm
13-
ENV PKG_RELEASE 2~bookworm
10+
ENV NGINX_VERSION 1.27.1
11+
ENV NJS_VERSION 0.8.5
12+
ENV NJS_RELEASE 1~bookworm
13+
ENV PKG_RELEASE 1~bookworm
14+
ENV DYNPKG_RELEASE 2~bookworm
1415

1516
RUN set -x \
1617
# create nginx user/group first, to be consistent throughout docker variants
@@ -39,9 +40,9 @@ RUN set -x \
3940
&& dpkgArch="$(dpkg --print-architecture)" \
4041
&& nginxPackages=" \
4142
nginx=${NGINX_VERSION}-${PKG_RELEASE} \
42-
nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
43-
nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
44-
nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
43+
nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
44+
nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
45+
nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
4546
nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
4647
" \
4748
&& case "$dpkgArch" in \

‎stable/alpine-otel/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM nginx:1.26.1-alpine
6+
FROM nginx:1.26.2-alpine
77

88
ENV OTEL_VERSION 0.1.0
99

1010
RUN set -x \
1111
&& apkArch="$(cat /etc/apk/arch)" \
1212
&& nginxPackages=" \
1313
nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
14-
nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
15-
nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
16-
nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
14+
nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
15+
nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
16+
nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
1717
nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
1818
nginx-module-otel=${NGINX_VERSION}.${OTEL_VERSION}-r${PKG_RELEASE} \
1919
" \
@@ -50,7 +50,7 @@ RUN set -x \
5050
export HOME=${tempDir} \
5151
&& cd ${tempDir} \
5252
&& 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\" \
53+
&& PKGOSSCHECKSUM=\"825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5454
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5555
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5656
else \

‎stable/alpine-perl/Dockerfile

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

88
RUN set -x \
99
&& apkArch="$(cat /etc/apk/arch)" \
1010
&& nginxPackages=" \
1111
nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
12-
nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
13-
nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
14-
nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
15-
nginx-module-perl=${NGINX_VERSION}-r${PKG_RELEASE} \
12+
nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
13+
nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
14+
nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
15+
nginx-module-perl=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
1616
nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
1717
" \
1818
# install prerequisites for public key and pkg-oss checks
@@ -45,7 +45,7 @@ RUN set -x \
4545
export HOME=${tempDir} \
4646
&& cd ${tempDir} \
4747
&& 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\" \
48+
&& PKGOSSCHECKSUM=\"825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
4949
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5050
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5151
else \

‎stable/alpine-slim/Dockerfile

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

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

10-
ENV NGINX_VERSION 1.26.1
11-
ENV PKG_RELEASE 2
10+
ENV NGINX_VERSION 1.26.2
11+
ENV PKG_RELEASE 1
12+
ENV DYNPKG_RELEASE 2
1213

1314
RUN set -x \
1415
# create nginx user/group first, to be consistent throughout docker variants
@@ -57,7 +58,7 @@ RUN set -x \
5758
export HOME=${tempDir} \
5859
&& cd ${tempDir} \
5960
&& 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+
&& PKGOSSCHECKSUM=\"825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6162
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6263
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6364
else \

‎stable/alpine/Dockerfile

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

8-
ENV NJS_VERSION 0.8.4
9-
ENV NJS_RELEASE 2
8+
ENV NJS_VERSION 0.8.5
9+
ENV NJS_RELEASE 1
1010

1111
RUN set -x \
1212
&& apkArch="$(cat /etc/apk/arch)" \
1313
&& nginxPackages=" \
1414
nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
15-
nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
16-
nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
17-
nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
15+
nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
16+
nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
17+
nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
1818
nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
1919
" \
2020
# install prerequisites for public key and pkg-oss checks
@@ -50,7 +50,7 @@ RUN set -x \
5050
export HOME=${tempDir} \
5151
&& cd ${tempDir} \
5252
&& 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\" \
53+
&& PKGOSSCHECKSUM=\"825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5454
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5555
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5656
else \

‎stable/debian-otel/Dockerfile

Lines changed: 4 additions & 4 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.1
6+
FROM nginx:1.26.2
77

88
ENV OTEL_VERSION 0.1.0
99

@@ -12,9 +12,9 @@ RUN set -x; \
1212
dpkgArch="$(dpkg --print-architecture)" \
1313
&& nginxPackages=" \
1414
nginx=${NGINX_VERSION}-${PKG_RELEASE} \
15-
nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
16-
nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
17-
nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
15+
nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
16+
nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
17+
nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
1818
nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
1919
nginx-module-otel=${NGINX_VERSION}+${OTEL_VERSION}-${PKG_RELEASE} \
2020
" \

‎stable/debian-perl/Dockerfile

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

88
RUN set -x; \
99
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
1010
dpkgArch="$(dpkg --print-architecture)" \
1111
&& nginxPackages=" \
1212
nginx=${NGINX_VERSION}-${PKG_RELEASE} \
13-
nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
14-
nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
15-
nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
16-
nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
13+
nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
14+
nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
15+
nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
16+
nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
1717
nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
1818
" \
1919
&& case "$dpkgArch" in \
@@ -37,11 +37,11 @@ RUN set -x; \
3737
\
3838
# build .deb files from upstream's source packages (which are verified by apt-get)
3939
&& apt-get update \
40-
&& apt-get build-dep -y nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
40+
&& apt-get build-dep -y nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
4141
&& ( \
4242
cd "$tempDir" \
4343
&& DEB_BUILD_OPTIONS="nocheck parallel=$(nproc)" \
44-
apt-get source --compile nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
44+
apt-get source --compile nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
4545
) \
4646
# we don't remove APT lists here because they get re-downloaded and removed later
4747
\

0 commit comments

Comments
 (0)