Skip to content

Commit 8655fa1

Browse files
alessfgalessfg
authored
feat: Update mainline NGINX to 1.27.5 (#301)
1 parent d193064 commit 8655fa1

File tree

13 files changed

+42
-87
lines changed

13 files changed

+42
-87
lines changed

‎Dockerfile-alpine-slim.template‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,23 +81,8 @@ RUN set -x \
8181
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
8282
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
8383
&& if [ -f "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
84-
# Bring in gettext so we can get `envsubst`, then throw
85-
# the rest away. To do this, we need to install `gettext`
86-
# then move `envsubst` out of the way so `gettext` can
87-
# be deleted completely, then move `envsubst` back.
88-
&& apk add --no-cache --virtual .gettext gettext \
89-
&& mv /usr/bin/envsubst /tmp/ \
90-
\
91-
&& runDeps="$( \
92-
scanelf --needed --nobanner /tmp/envsubst \
93-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
94-
| sort -u \
95-
| xargs -r apk info --installed \
96-
| sort -u \
97-
)" \
98-
&& apk add --no-cache $runDeps \
99-
&& apk del --no-network .gettext \
100-
&& mv /tmp/envsubst /usr/local/bin/ \
84+
# Add `envsubst` for templating environment variables
85+
&& apk add --no-cache gettext-envsubst \
10186
# Bring in tzdata so users could set the timezones through the environment
10287
# variables
10388
&& apk add --no-cache tzdata \

‎SUPPORT.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Ask a Question
44

5-
We use GitHub for tracking bugs and feature requests related to all the Docker NGINX images (including all variants and container registries).
5+
We use GitHub for tracking bugs and feature requests related to all Docker NGINX unprivileged images (including all variants and container registries).
66

77
Don't know how something in this project works? Curious if this project can achieve your desired functionality? Please open an issue on GitHub with the label `question`. Alternatively, start a GitHub discussion!
88

‎mainline/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-
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.4-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.5-alpine
77
FROM $IMAGE
88

99
ARG UID=101
@@ -52,7 +52,7 @@ RUN set -x \
5252
export HOME=${tempDir} \
5353
&& cd ${tempDir} \
5454
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
55-
&& PKGOSSCHECKSUM=\"973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
55+
&& PKGOSSCHECKSUM=\"c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5656
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5757
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5858
else \

‎mainline/alpine-slim/Dockerfile‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM $IMAGE
88

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

11-
ENV NGINX_VERSION=1.27.4
11+
ENV NGINX_VERSION=1.27.5
1212
ENV PKG_RELEASE=1
1313
ENV DYNPKG_RELEASE=1
1414

@@ -63,7 +63,7 @@ RUN set -x \
6363
export HOME=${tempDir} \
6464
&& cd ${tempDir} \
6565
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66-
&& PKGOSSCHECKSUM=\"973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
66+
&& PKGOSSCHECKSUM=\"c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6767
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6868
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6969
else \
@@ -87,23 +87,8 @@ RUN set -x \
8787
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
8888
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
8989
&& if [ -f "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
90-
# Bring in gettext so we can get `envsubst`, then throw
91-
# the rest away. To do this, we need to install `gettext`
92-
# then move `envsubst` out of the way so `gettext` can
93-
# be deleted completely, then move `envsubst` back.
94-
&& apk add --no-cache --virtual .gettext gettext \
95-
&& mv /usr/bin/envsubst /tmp/ \
96-
\
97-
&& runDeps="$( \
98-
scanelf --needed --nobanner /tmp/envsubst \
99-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
100-
| sort -u \
101-
| xargs -r apk info --installed \
102-
| sort -u \
103-
)" \
104-
&& apk add --no-cache $runDeps \
105-
&& apk del --no-network .gettext \
106-
&& mv /tmp/envsubst /usr/local/bin/ \
90+
# Add `envsubst` for templating environment variables
91+
&& apk add --no-cache gettext-envsubst \
10792
# Bring in tzdata so users could set the timezones through the environment
10893
# variables
10994
&& apk add --no-cache tzdata \

‎mainline/alpine/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.4-alpine-slim
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.5-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION=0.8.9
9+
ENV NJS_VERSION=0.8.10
1010
ENV NJS_RELEASE=1
1111

1212
ARG UID=101
@@ -57,7 +57,7 @@ RUN set -x \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
5959
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60+
&& PKGOSSCHECKSUM=\"c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6161
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \

‎mainline/debian-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-
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.4
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.5
77
FROM $IMAGE
88

99
ARG UID=101
@@ -54,7 +54,7 @@ RUN set -x; \
5454
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
5555
&& REVISION=${REVISION%~*} \
5656
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
57-
&& PKGOSSCHECKSUM="973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${REVISION}.tar.gz" \
57+
&& PKGOSSCHECKSUM="c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${REVISION}.tar.gz" \
5858
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
5959
echo "pkg-oss tarball checksum verification succeeded!"; \
6060
else \

‎mainline/debian/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM $IMAGE
88

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

11-
ENV NGINX_VERSION=1.27.4
12-
ENV NJS_VERSION=0.8.9
11+
ENV NGINX_VERSION=1.27.5
12+
ENV NJS_VERSION=0.8.10
1313
ENV NJS_RELEASE=1~bookworm
1414
ENV PKG_RELEASE=1~bookworm
1515
ENV DYNPKG_RELEASE=1~bookworm
@@ -81,7 +81,7 @@ RUN set -x \
8181
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
8282
&& REVISION=${REVISION%~*} \
8383
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
84-
&& PKGOSSCHECKSUM="973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${REVISION}.tar.gz" \
84+
&& PKGOSSCHECKSUM="c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${REVISION}.tar.gz" \
8585
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
8686
echo "pkg-oss tarball checksum verification succeeded!"; \
8787
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-
ARG IMAGE=nginxinc/nginx-unprivileged:1.26.3-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.28.0-alpine
77
FROM $IMAGE
88

99
ARG UID=101
@@ -52,7 +52,7 @@ RUN set -x \
5252
export HOME=${tempDir} \
5353
&& cd ${tempDir} \
5454
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
55-
&& PKGOSSCHECKSUM=\"3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
55+
&& PKGOSSCHECKSUM=\"517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5656
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5757
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5858
else \

‎stable/alpine-slim/Dockerfile‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=alpine:3.20
6+
ARG IMAGE=alpine:3.21
77
FROM $IMAGE
88

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

11-
ENV NGINX_VERSION=1.26.3
11+
ENV NGINX_VERSION=1.28.0
1212
ENV PKG_RELEASE=1
13-
ENV DYNPKG_RELEASE=2
13+
ENV DYNPKG_RELEASE=1
1414

1515
ARG UID=101
1616
ARG GID=101
@@ -63,7 +63,7 @@ RUN set -x \
6363
export HOME=${tempDir} \
6464
&& cd ${tempDir} \
6565
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66-
&& PKGOSSCHECKSUM=\"3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
66+
&& PKGOSSCHECKSUM=\"517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6767
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6868
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6969
else \
@@ -87,23 +87,8 @@ RUN set -x \
8787
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
8888
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
8989
&& if [ -f "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
90-
# Bring in gettext so we can get `envsubst`, then throw
91-
# the rest away. To do this, we need to install `gettext`
92-
# then move `envsubst` out of the way so `gettext` can
93-
# be deleted completely, then move `envsubst` back.
94-
&& apk add --no-cache --virtual .gettext gettext \
95-
&& mv /usr/bin/envsubst /tmp/ \
96-
\
97-
&& runDeps="$( \
98-
scanelf --needed --nobanner /tmp/envsubst \
99-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
100-
| sort -u \
101-
| xargs -r apk info --installed \
102-
| sort -u \
103-
)" \
104-
&& apk add --no-cache $runDeps \
105-
&& apk del --no-network .gettext \
106-
&& mv /tmp/envsubst /usr/local/bin/ \
90+
# Add `envsubst` for templating environment variables
91+
&& apk add --no-cache gettext-envsubst \
10792
# Bring in tzdata so users could set the timezones through the environment
10893
# variables
10994
&& apk add --no-cache tzdata \

‎stable/alpine/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.26.3-alpine-slim
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.28.0-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION=0.8.9
9+
ENV NJS_VERSION=0.8.10
1010
ENV NJS_RELEASE=1
1111

1212
ARG UID=101
@@ -57,7 +57,7 @@ RUN set -x \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
5959
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"3a4e869eded0c71e92f522e94edffea7fbfb5e78886ea7e484342fa2e028c62099a67d08860c249bf93776da97b924225e0d849dbb4697b298afe5421d7d6fea *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60+
&& PKGOSSCHECKSUM=\"517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6161
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \

0 commit comments

Comments
 (0)