Skip to content

Commit 5bc0c35

Browse files
build(app): bump app to latest
1 parent 0c25347 commit 5bc0c35

File tree

6 files changed

+14
-44
lines changed

6 files changed

+14
-44
lines changed

nginx/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-
FROM ghcr.io/loong64/nginx:1.27.4-alpine
6+
FROM ghcr.io/loong64/nginx:1.27.5-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=\"973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
49+
&& PKGOSSCHECKSUM=\"c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${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 \

nginx/mainline/alpine-slim/Dockerfile

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM ghcr.io/loong64/alpine:3.21
77

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

10-
ENV NGINX_VERSION 1.27.4
10+
ENV NGINX_VERSION 1.27.5
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=\"973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
62+
&& PKGOSSCHECKSUM=\"c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${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 \
@@ -83,23 +83,8 @@ RUN set -x \
8383
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
8484
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
8585
&& if [ -f "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
86-
# Bring in gettext so we can get `envsubst`, then throw
87-
# the rest away. To do this, we need to install `gettext`
88-
# then move `envsubst` out of the way so `gettext` can
89-
# be deleted completely, then move `envsubst` back.
90-
&& apk add --no-cache --virtual .gettext gettext \
91-
&& mv /usr/bin/envsubst /tmp/ \
92-
\
93-
&& runDeps="$( \
94-
scanelf --needed --nobanner /tmp/envsubst \
95-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
96-
| sort -u \
97-
| xargs -r apk info --installed \
98-
| sort -u \
99-
)" \
100-
&& apk add --no-cache $runDeps \
101-
&& apk del --no-network .gettext \
102-
&& mv /tmp/envsubst /usr/local/bin/ \
86+
# Add `envsubst` for templating environment variables
87+
&& apk add --no-cache gettext-envsubst \
10388
# Bring in tzdata so users could set the timezones through the environment
10489
# variables
10590
&& apk add --no-cache tzdata \

nginx/mainline/alpine/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 ghcr.io/loong64/nginx:1.27.4-alpine-slim
6+
FROM ghcr.io/loong64/nginx:1.27.5-alpine-slim
77

88
RUN set -x \
99
&& apkArch="$(cat /etc/apk/arch)" \
@@ -48,7 +48,7 @@ RUN set -x \
4848
export HOME=${tempDir} \
4949
&& cd ${tempDir} \
5050
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
51-
&& PKGOSSCHECKSUM=\"973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
51+
&& PKGOSSCHECKSUM=\"c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5252
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5353
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5454
else \

nginx/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-
FROM ghcr.io/loong64/nginx:1.27.4
6+
FROM ghcr.io/loong64/nginx:1.27.5
77

88
RUN set -x; \
99
NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
@@ -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="973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${REVISION}.tar.gz" \
51+
&& PKGOSSCHECKSUM="c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${REVISION}.tar.gz" \
5252
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
5353
echo "pkg-oss tarball checksum verification succeeded!"; \
5454
else \

nginx/mainline/debian/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM ghcr.io/loong64/debian:trixie-slim
77

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

10-
ENV NGINX_VERSION 1.27.4
10+
ENV NGINX_VERSION 1.27.5
1111
ENV PKG_RELEASE 1~trixie
1212
ENV DYNPKG_RELEASE 1~trixie
1313

@@ -75,7 +75,7 @@ RUN set -x \
7575
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
7676
&& REVISION=${REVISION%~*} \
7777
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
78-
&& PKGOSSCHECKSUM="973690e64fa47e3704e817a3b08205b9e3f8c0cbe31825d9d62a81c11eb3aa186df015f27fdfd48c8799ffc528e38a9168c592ae665e4835c2d28638ec5f7845 *${REVISION}.tar.gz" \
78+
&& PKGOSSCHECKSUM="c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${REVISION}.tar.gz" \
7979
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
8080
echo "pkg-oss tarball checksum verification succeeded!"; \
8181
else \

nginx/stable/alpine-slim/Dockerfile

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

0 commit comments

Comments
 (0)