Skip to content

Commit cffeb93

Browse files
thresheekthresheek
committed
Updated dockerfiles after the last commits.
1 parent a91845d commit cffeb93

File tree

14 files changed

+78
-78
lines changed

14 files changed

+78
-78
lines changed

‎mainline/alpine-otel/Dockerfile

+9-9
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.3-alpine
6+
FROM nginx:1.27.4-alpine
77

8-
ENV OTEL_VERSION 0.1.0
8+
ENV OTEL_VERSION 0.1.1
99

1010
RUN set -x \
1111
&& apkArch="$(cat /etc/apk/arch)" \
@@ -45,21 +45,21 @@ RUN set -x \
4545
findutils \
4646
curl \
4747
xz \
48-
re2-dev \
49-
c-ares-dev \
48+
protobuf-dev \
49+
grpc-dev \
5050
&& su nobody -s /bin/sh -c " \
5151
export HOME=${tempDir} \
5252
&& cd ${tempDir} \
53-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
54-
&& PKGOSSCHECKSUM=\"1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz\" \
55-
&& if [ \"\$(openssl sha512 -r 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
53+
&& 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\" \
55+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5656
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5757
else \
5858
echo \"pkg-oss tarball checksum verification failed!\"; \
5959
exit 1; \
6060
fi \
61-
&& tar xzvf 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
62-
&& cd pkg-oss-0286c5190d972a49bffc9bf247885dd510ce8181 \
61+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6363
&& cd alpine \
6464
&& make module-otel \
6565
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine-perl/Dockerfile

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

88
RUN set -x \
99
&& apkArch="$(cat /etc/apk/arch)" \
@@ -45,16 +45,16 @@ RUN set -x \
4545
&& su nobody -s /bin/sh -c " \
4646
export HOME=${tempDir} \
4747
&& cd ${tempDir} \
48-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
49-
&& PKGOSSCHECKSUM=\"1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz\" \
50-
&& if [ \"\$(openssl sha512 -r 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
48+
&& 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\" \
50+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5151
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5252
else \
5353
echo \"pkg-oss tarball checksum verification failed!\"; \
5454
exit 1; \
5555
fi \
56-
&& tar xzvf 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
57-
&& cd pkg-oss-0286c5190d972a49bffc9bf247885dd510ce8181 \
56+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
57+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
5858
&& cd alpine \
5959
&& make module-perl \
6060
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine-slim/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM alpine:3.21
77

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

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

@@ -58,16 +58,16 @@ RUN set -x \
5858
&& su nobody -s /bin/sh -c " \
5959
export HOME=${tempDir} \
6060
&& cd ${tempDir} \
61-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
62-
&& PKGOSSCHECKSUM=\"1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz\" \
63-
&& if [ \"\$(openssl sha512 -r 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
61+
&& 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\" \
63+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6464
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6565
else \
6666
echo \"pkg-oss tarball checksum verification failed!\"; \
6767
exit 1; \
6868
fi \
69-
&& tar xzvf 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
70-
&& cd pkg-oss-0286c5190d972a49bffc9bf247885dd510ce8181 \
69+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
70+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7171
&& cd alpine \
7272
&& make base \
7373
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine/Dockerfile

+7-7
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.3-alpine-slim
6+
FROM nginx:1.27.4-alpine-slim
77

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

1111
RUN set -x \
@@ -50,16 +50,16 @@ RUN set -x \
5050
&& su nobody -s /bin/sh -c " \
5151
export HOME=${tempDir} \
5252
&& cd ${tempDir} \
53-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
54-
&& PKGOSSCHECKSUM=\"1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz\" \
55-
&& if [ \"\$(openssl sha512 -r 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
53+
&& 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\" \
55+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5656
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5757
else \
5858
echo \"pkg-oss tarball checksum verification failed!\"; \
5959
exit 1; \
6060
fi \
61-
&& tar xzvf 0286c5190d972a49bffc9bf247885dd510ce8181.tar.gz \
62-
&& cd pkg-oss-0286c5190d972a49bffc9bf247885dd510ce8181 \
61+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6363
&& cd alpine \
6464
&& make module-geoip module-image-filter module-njs module-xslt \
6565
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/debian-otel/Dockerfile

+4-4
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.3
6+
FROM nginx:1.27.4
77

8-
ENV OTEL_VERSION 0.1.0
8+
ENV OTEL_VERSION 0.1.1
99

1010
RUN set -x; \
1111
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
@@ -47,10 +47,10 @@ RUN set -x; \
4747
xsltproc \
4848
&& ( \
4949
cd "$tempDir" \
50-
&& REVISION="0286c5190d972a49bffc9bf247885dd510ce8181" \
50+
&& 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="1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *${REVISION}.tar.gz" \
53+
&& PKGOSSCHECKSUM="973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${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

+3-3
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.3
6+
FROM nginx:1.27.4
77

88
RUN set -x; \
99
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
@@ -45,10 +45,10 @@ RUN set -x; \
4545
xsltproc \
4646
&& ( \
4747
cd "$tempDir" \
48-
&& REVISION="0286c5190d972a49bffc9bf247885dd510ce8181" \
48+
&& 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="1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *${REVISION}.tar.gz" \
51+
&& PKGOSSCHECKSUM="973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${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

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

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

10-
ENV NGINX_VERSION 1.27.3
11-
ENV NJS_VERSION 0.8.8
10+
ENV NGINX_VERSION 1.27.4
11+
ENV NJS_VERSION 0.8.9
1212
ENV NJS_RELEASE 1~bookworm
1313
ENV PKG_RELEASE 1~bookworm
1414
ENV DYNPKG_RELEASE 1~bookworm
@@ -74,10 +74,10 @@ RUN set -x \
7474
xsltproc \
7575
&& ( \
7676
cd "$tempDir" \
77-
&& REVISION="0286c5190d972a49bffc9bf247885dd510ce8181" \
77+
&& 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="1e546bd15d7bc68e1772ecb6a73e29ba108ee5554a28928e57af038a9e8fc4f5cd35708ce89ad1dfaac97d870e663d32ef41045611d30b20d38b46816e3ab535 *${REVISION}.tar.gz" \
80+
&& PKGOSSCHECKSUM="973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${REVISION}.tar.gz" \
8181
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
8282
echo "pkg-oss tarball checksum verification succeeded!"; \
8383
else \

‎stable/alpine-otel/Dockerfile

+9-9
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.26.2-alpine
6+
FROM nginx:1.26.3-alpine
77

8-
ENV OTEL_VERSION 0.1.0
8+
ENV OTEL_VERSION 0.1.1
99

1010
RUN set -x \
1111
&& apkArch="$(cat /etc/apk/arch)" \
@@ -45,21 +45,21 @@ RUN set -x \
4545
findutils \
4646
curl \
4747
xz \
48-
re2-dev \
49-
c-ares-dev \
48+
protobuf-dev \
49+
grpc-dev \
5050
&& su nobody -s /bin/sh -c " \
5151
export HOME=${tempDir} \
5252
&& cd ${tempDir} \
53-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
54-
&& PKGOSSCHECKSUM=\"315e9e9040253396ebd9f540557e69cda7d9754a7895c3bf04fbf79d43be8d56e8efc6c22c21c87632039340080511179946456bbc4660e8faf171d130b475a6 *f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz\" \
55-
&& if [ \"\$(openssl sha512 -r f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
53+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
54+
&& PKGOSSCHECKSUM=\"3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
55+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5656
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5757
else \
5858
echo \"pkg-oss tarball checksum verification failed!\"; \
5959
exit 1; \
6060
fi \
61-
&& tar xzvf f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
62-
&& cd pkg-oss-f43e929dc7a6111ef5d9ecb281a75749f7934261 \
61+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6363
&& cd alpine \
6464
&& make module-otel \
6565
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine-perl/Dockerfile

+6-6
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.2-alpine
6+
FROM nginx:1.26.3-alpine
77

88
RUN set -x \
99
&& apkArch="$(cat /etc/apk/arch)" \
@@ -45,16 +45,16 @@ RUN set -x \
4545
&& su nobody -s /bin/sh -c " \
4646
export HOME=${tempDir} \
4747
&& cd ${tempDir} \
48-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
49-
&& PKGOSSCHECKSUM=\"315e9e9040253396ebd9f540557e69cda7d9754a7895c3bf04fbf79d43be8d56e8efc6c22c21c87632039340080511179946456bbc4660e8faf171d130b475a6 *f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz\" \
50-
&& if [ \"\$(openssl sha512 -r f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
48+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
49+
&& PKGOSSCHECKSUM=\"3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
50+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5151
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5252
else \
5353
echo \"pkg-oss tarball checksum verification failed!\"; \
5454
exit 1; \
5555
fi \
56-
&& tar xzvf f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
57-
&& cd pkg-oss-f43e929dc7a6111ef5d9ecb281a75749f7934261 \
56+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
57+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
5858
&& cd alpine \
5959
&& make module-perl \
6060
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine-slim/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM alpine:3.20
77

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

10-
ENV NGINX_VERSION 1.26.2
10+
ENV NGINX_VERSION 1.26.3
1111
ENV PKG_RELEASE 1
1212
ENV DYNPKG_RELEASE 2
1313

@@ -58,16 +58,16 @@ RUN set -x \
5858
&& su nobody -s /bin/sh -c " \
5959
export HOME=${tempDir} \
6060
&& cd ${tempDir} \
61-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
62-
&& PKGOSSCHECKSUM=\"315e9e9040253396ebd9f540557e69cda7d9754a7895c3bf04fbf79d43be8d56e8efc6c22c21c87632039340080511179946456bbc4660e8faf171d130b475a6 *f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz\" \
63-
&& if [ \"\$(openssl sha512 -r f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
61+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62+
&& PKGOSSCHECKSUM=\"3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
63+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6464
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6565
else \
6666
echo \"pkg-oss tarball checksum verification failed!\"; \
6767
exit 1; \
6868
fi \
69-
&& tar xzvf f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
70-
&& cd pkg-oss-f43e929dc7a6111ef5d9ecb281a75749f7934261 \
69+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
70+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7171
&& cd alpine \
7272
&& make base \
7373
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine/Dockerfile

+7-7
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.26.2-alpine-slim
6+
FROM nginx:1.26.3-alpine-slim
77

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

1111
RUN set -x \
@@ -50,16 +50,16 @@ RUN set -x \
5050
&& su nobody -s /bin/sh -c " \
5151
export HOME=${tempDir} \
5252
&& cd ${tempDir} \
53-
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
54-
&& PKGOSSCHECKSUM=\"315e9e9040253396ebd9f540557e69cda7d9754a7895c3bf04fbf79d43be8d56e8efc6c22c21c87632039340080511179946456bbc4660e8faf171d130b475a6 *f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz\" \
55-
&& if [ \"\$(openssl sha512 -r f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
53+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
54+
&& PKGOSSCHECKSUM=\"3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
55+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5656
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5757
else \
5858
echo \"pkg-oss tarball checksum verification failed!\"; \
5959
exit 1; \
6060
fi \
61-
&& tar xzvf f43e929dc7a6111ef5d9ecb281a75749f7934261.tar.gz \
62-
&& cd pkg-oss-f43e929dc7a6111ef5d9ecb281a75749f7934261 \
61+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
62+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6363
&& cd alpine \
6464
&& make module-geoip module-image-filter module-njs module-xslt \
6565
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

0 commit comments

Comments
 (0)