Skip to content

Commit 50dc9c3

Browse files
thresheekthresheek
committed
Updated dockerfiles after the last commits
1 parent 1733df4 commit 50dc9c3

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎stable/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.28.0-alpine
6+
FROM nginx:1.28.1-alpine
77

88
ENV OTEL_VERSION 0.1.2
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=\"517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
54+
&& PKGOSSCHECKSUM=\"4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${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 \

‎stable/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.28.0-alpine
6+
FROM nginx:1.28.1-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=\"517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
49+
&& PKGOSSCHECKSUM=\"4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${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 \

‎stable/alpine-slim/Dockerfile‎

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

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

10-
ENV NGINX_VERSION 1.28.0
10+
ENV NGINX_VERSION 1.28.1
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=\"517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
62+
&& PKGOSSCHECKSUM=\"4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${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 \

‎stable/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.28.0-alpine-slim
6+
FROM nginx:1.28.1-alpine-slim
77

8-
ENV NJS_VERSION 0.8.10
8+
ENV NJS_VERSION 0.9.4
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=\"517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
54+
&& PKGOSSCHECKSUM=\"4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${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 \

‎stable/debian-otel/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.28.0
6+
FROM nginx:1.28.1
77

88
ENV OTEL_VERSION 0.1.2
99

@@ -21,7 +21,7 @@ RUN set -x; \
2121
&& case "$dpkgArch" in \
2222
amd64|arm64) \
2323
# arches officialy built by upstream
24-
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
24+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \
2525
&& apt-get update \
2626
;; \
2727
*) \
@@ -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="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${REVISION}.tar.gz" \
53+
&& PKGOSSCHECKSUM="4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${REVISION}.tar.gz" \
5454
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
5555
echo "pkg-oss tarball checksum verification succeeded!"; \
5656
else \

‎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.28.0
6+
FROM nginx:1.28.1
77

88
RUN set -x; \
99
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
@@ -19,7 +19,7 @@ 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/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
22+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \
2323
&& apt-get update \
2424
;; \
2525
*) \
@@ -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="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${REVISION}.tar.gz" \
51+
&& PKGOSSCHECKSUM="4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${REVISION}.tar.gz" \
5252
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
5353
echo "pkg-oss tarball checksum verification succeeded!"; \
5454
else \

‎stable/debian/Dockerfile‎

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

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

10-
ENV NGINX_VERSION 1.28.0
11-
ENV NJS_VERSION 0.8.10
12-
ENV NJS_RELEASE 1~bookworm
13-
ENV PKG_RELEASE 1~bookworm
14-
ENV DYNPKG_RELEASE 1~bookworm
10+
ENV NGINX_VERSION 1.28.1
11+
ENV NJS_VERSION 0.9.4
12+
ENV NJS_RELEASE 1~trixie
13+
ENV PKG_RELEASE 1~trixie
14+
ENV DYNPKG_RELEASE 1~trixie
1515

1616
RUN set -x \
1717
# create nginx user/group first, to be consistent throughout docker variants
@@ -48,7 +48,7 @@ RUN set -x \
4848
&& case "$dpkgArch" in \
4949
amd64|arm64) \
5050
# arches officialy built by upstream
51-
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
51+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \
5252
&& apt-get update \
5353
;; \
5454
*) \
@@ -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="517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${REVISION}.tar.gz" \
80+
&& PKGOSSCHECKSUM="4d43d5eadf39a2428e91a4e6fde0188f1cfb76354598d818d2ef2f8ff5cfa8d65993248b19a2d7ae663798d2362905e63ebd5dca6ca82cabc2831631d0e079ea *${REVISION}.tar.gz" \
8181
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
8282
echo "pkg-oss tarball checksum verification succeeded!"; \
8383
else \

0 commit comments

Comments
 (0)