Skip to content

Commit ed439d2

Browse files
committed
Updated stable nginx to 1.26.0 and moved to bookworm.
This also adds otel module to stable images.
1 parent b7a3296 commit ed439d2

File tree

8 files changed

+216
-37
lines changed

8 files changed

+216
-37
lines changed

stable/alpine-otel/Dockerfile

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
#
6+
FROM nginx:1.26.0-alpine
7+
8+
ENV OTEL_VERSION 0.1.0
9+
10+
RUN set -x \
11+
&& apkArch="$(cat /etc/apk/arch)" \
12+
&& nginxPackages=" \
13+
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} \
17+
nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${PKG_RELEASE} \
18+
nginx-module-otel=${NGINX_VERSION}.${OTEL_VERSION}-r${PKG_RELEASE} \
19+
" \
20+
# install prerequisites for public key and pkg-oss checks
21+
&& apk add --no-cache --virtual .checksum-deps \
22+
openssl \
23+
&& case "$apkArch" in \
24+
x86_64|aarch64) \
25+
# arches officially built by upstream
26+
set -x \
27+
&& KEY_SHA512="e09fa32f0a0eab2b879ccbbc4d0e4fb9751486eedda75e35fac65802cc9faa266425edf83e261137a2f4d16281ce2c1a5f4502930fe75154723da014214f0655" \
28+
&& wget -O /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub \
29+
&& if echo "$KEY_SHA512 */tmp/nginx_signing.rsa.pub" | sha512sum -c -; then \
30+
echo "key verification succeeded!"; \
31+
mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/; \
32+
else \
33+
echo "key verification failed!"; \
34+
exit 1; \
35+
fi \
36+
&& apk add -X "https://nginx.org/packages/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" --no-cache $nginxPackages \
37+
;; \
38+
*) \
39+
# we're on an architecture upstream doesn't officially build for
40+
# let's build binaries from the published packaging sources
41+
set -x \
42+
&& tempDir="$(mktemp -d)" \
43+
&& chown nobody:nobody $tempDir \
44+
&& apk add --no-cache --virtual .build-deps \
45+
gcc \
46+
libc-dev \
47+
make \
48+
openssl-dev \
49+
pcre2-dev \
50+
zlib-dev \
51+
linux-headers \
52+
cmake \
53+
bash \
54+
alpine-sdk \
55+
findutils \
56+
xz \
57+
re2-dev \
58+
c-ares-dev \
59+
&& su nobody -s /bin/sh -c " \
60+
export HOME=${tempDir} \
61+
&& cd ${tempDir} \
62+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
63+
&& PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
64+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
65+
echo \"pkg-oss tarball checksum verification succeeded!\"; \
66+
else \
67+
echo \"pkg-oss tarball checksum verification failed!\"; \
68+
exit 1; \
69+
fi \
70+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
71+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
72+
&& cd alpine \
73+
&& make module-otel \
74+
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
75+
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
76+
" \
77+
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \
78+
&& apk del --no-network .build-deps \
79+
&& apk add -X ${tempDir}/packages/alpine/ --no-cache $nginxPackages \
80+
;; \
81+
esac \
82+
# remove checksum deps
83+
&& apk del --no-network .checksum-deps \
84+
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
85+
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
86+
&& if [ -f "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
87+
&& if [ -f "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi

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.24.0-alpine
6+
FROM nginx:1.26.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/e5d85b3424bb.tar.gz \
48-
&& PKGOSSCHECKSUM=\"4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b *e5d85b3424bb.tar.gz\" \
49-
&& if [ \"\$(openssl sha512 -r e5d85b3424bb.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
47+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
48+
&& PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${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 e5d85b3424bb.tar.gz \
56-
&& cd pkg-oss-e5d85b3424bb \
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM alpine:3.19
77

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

10-
ENV NGINX_VERSION 1.24.0
10+
ENV NGINX_VERSION 1.26.0
1111
ENV PKG_RELEASE 1
1212

1313
RUN set -x \
@@ -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/e5d85b3424bb.tar.gz \
60-
&& PKGOSSCHECKSUM=\"4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b *e5d85b3424bb.tar.gz\" \
61-
&& if [ \"\$(openssl sha512 -r e5d85b3424bb.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
59+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60+
&& PKGOSSCHECKSUM=\"f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb *${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 e5d85b3424bb.tar.gz \
68-
&& cd pkg-oss-e5d85b3424bb \
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 \

stable/alpine/Dockerfile

Lines changed: 7 additions & 7 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.24.0-alpine-slim
6+
FROM nginx:1.26.0-alpine-slim
77

8-
ENV NJS_VERSION 0.8.0
8+
ENV NJS_VERSION 0.8.4
99

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

stable/debian-otel/Dockerfile

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
#
6+
FROM nginx:1.26.0
7+
8+
ENV OTEL_VERSION 0.1.0
9+
10+
RUN set -x \
11+
&& apt-get update \
12+
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \
13+
&& \
14+
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
15+
NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
16+
export GNUPGHOME="$(mktemp -d)"; \
17+
found=''; \
18+
for server in \
19+
hkp://keyserver.ubuntu.com:80 \
20+
pgp.mit.edu \
21+
; do \
22+
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
23+
gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
24+
done; \
25+
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
26+
gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" ; \
27+
rm -rf "$GNUPGHOME"; \
28+
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
29+
&& dpkgArch="$(dpkg --print-architecture)" \
30+
&& nginxPackages=" \
31+
nginx=${NGINX_VERSION}-${PKG_RELEASE} \
32+
nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
33+
nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
34+
nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
35+
nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${PKG_RELEASE} \
36+
nginx-module-otel=${NGINX_VERSION}+${OTEL_VERSION}-${PKG_RELEASE} \
37+
" \
38+
&& case "$dpkgArch" in \
39+
amd64|arm64) \
40+
# arches officialy built by upstream
41+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
42+
&& apt-get update \
43+
;; \
44+
*) \
45+
# we're on an architecture upstream doesn't officially build for
46+
# let's build binaries from the published source packages
47+
echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
48+
\
49+
# new directory for storing sources and .deb files
50+
&& tempDir="$(mktemp -d)" \
51+
&& chmod 777 "$tempDir" \
52+
# (777 to ensure APT's "_apt" user can access it too)
53+
\
54+
# save list of currently-installed packages so build dependencies can be cleanly removed later
55+
&& savedAptMark="$(apt-mark showmanual)" \
56+
\
57+
# build .deb files from upstream's source packages (which are verified by apt-get)
58+
&& apt-get update \
59+
&& apt-get build-dep -y nginx-module-otel \
60+
&& ( \
61+
cd "$tempDir" \
62+
&& DEB_BUILD_OPTIONS="nocheck parallel=$(nproc)" \
63+
apt-get source --compile nginx-module-otel \
64+
) \
65+
# we don't remove APT lists here because they get re-downloaded and removed later
66+
\
67+
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
68+
# (which is done after we install the built packages so we don't have to redownload any overlapping dependencies)
69+
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
70+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
71+
\
72+
# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
73+
&& ls -lAFh "$tempDir" \
74+
&& ( cd "$tempDir" && dpkg-scanpackages . > Packages ) \
75+
&& grep '^Package: ' "$tempDir/Packages" \
76+
&& echo "deb [ trusted=yes ] file://$tempDir ./" > /etc/apt/sources.list.d/temp.list \
77+
# work around the following APT issue by using "Acquire::GzipIndexes=false" (overriding "/etc/apt/apt.conf.d/docker-gzip-indexes")
78+
# Could not open file /var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages - open (13: Permission denied)
79+
# ...
80+
# E: Failed to fetch store:/var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages Could not open file /var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages - open (13: Permission denied)
81+
&& apt-get -o Acquire::GzipIndexes=false update \
82+
;; \
83+
esac \
84+
\
85+
&& apt-get install --no-install-recommends --no-install-suggests -y \
86+
$nginxPackages \
87+
gettext-base \
88+
curl \
89+
&& apt-get remove --purge --auto-remove -y && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
90+
\
91+
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
92+
&& if [ -n "$tempDir" ]; then \
93+
apt-get purge -y --auto-remove \
94+
&& rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
95+
fi

stable/debian-perl/Dockerfile

Lines changed: 3 additions & 3 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.24.0
6+
FROM nginx:1.26.0
77

88
RUN set -x; \
99
NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
@@ -19,13 +19,13 @@ RUN set -x; \
1919
&& case "$dpkgArch" in \
2020
amd64|arm64) \
2121
# arches officialy built by upstream
22-
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
22+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
2323
&& apt-get update \
2424
;; \
2525
*) \
2626
# we're on an architecture upstream doesn't officially build for
2727
# let's build binaries from the published source packages
28-
echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
28+
echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
2929
\
3030
# new directory for storing sources and .deb files
3131
&& tempDir="$(mktemp -d)" \

stable/debian/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM debian:bullseye-slim
6+
FROM debian:bookworm-slim
77

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

10-
ENV NGINX_VERSION 1.24.0
11-
ENV NJS_VERSION 0.8.0
12-
ENV PKG_RELEASE 1~bullseye
10+
ENV NGINX_VERSION 1.26.0
11+
ENV NJS_VERSION 0.8.4
12+
ENV PKG_RELEASE 1~bookworm
1313

1414
RUN set -x \
1515
# create nginx user/group first, to be consistent throughout docker variants
@@ -44,13 +44,13 @@ RUN set -x \
4444
&& case "$dpkgArch" in \
4545
amd64|arm64) \
4646
# arches officialy built by upstream
47-
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
47+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
4848
&& apt-get update \
4949
;; \
5050
*) \
5151
# we're on an architecture upstream doesn't officially build for
5252
# let's build binaries from the published source packages
53-
echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
53+
echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
5454
\
5555
# new directory for storing sources and .deb files
5656
&& tempDir="$(mktemp -d)" \

update.sh

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ declare branches=(
1313
# Remember to update pkgosschecksum when changing this.
1414
declare -A nginx=(
1515
[mainline]='1.25.5'
16-
[stable]='1.24.0'
16+
[stable]='1.26.0'
1717
)
1818

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

2525
# Current otel versions
@@ -37,7 +37,7 @@ declare -A pkg=(
3737

3838
declare -A debian=(
3939
[mainline]='bookworm'
40-
[stable]='bullseye'
40+
[stable]='bookworm'
4141
)
4242

4343
declare -A alpine=(
@@ -51,15 +51,15 @@ declare -A alpine=(
5151
# Remember to update pkgosschecksum when changing this.
5252
declare -A rev=(
5353
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
54-
[stable]='e5d85b3424bb'
54+
[stable]='${NGINX_VERSION}-${PKG_RELEASE}'
5555
)
5656

5757
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
5858
# revision/tag in the previous block
5959
# Used in alpine builds for architectures not packaged by nginx.org
6060
declare -A pkgosschecksum=(
6161
[mainline]='74000f32ab250be492a8ae4d408cd63a4c422f4f0af84689973a2844fceeb8a3e7e12b04d7c6dac0f993d7102d920a5f60e6f49be23ce4093f48a8eb1ae36ce5'
62-
[stable]='4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b'
62+
[stable]='f0ee7cef9a6e4aa1923177eb2782577ce61837c22c59bd0c3bd027a0a4dc3a3cdc4a16e95480a075bdee32ae59c0c6385dfadb971f93931fea84976c4a21fceb'
6363
)
6464

6565
get_packages() {
@@ -87,10 +87,7 @@ get_packages() {
8787
*-perl)
8888
perl="nginx-module-perl"
8989
;;
90-
esac
91-
92-
case "$distro:$branch" in
93-
*-otel:mainline)
90+
*-otel)
9491
otel="nginx-module-otel"
9592
bn="\n"
9693
;;

0 commit comments

Comments
 (0)