Skip to content

Commit f633d7b

Browse files
alessfgalessfg
authored
Update mainline NGINX to 1.27.1 (#238)
* And update stable NGINX to 1.26.2 * Update NJS to 0.8.5 * Introduce specific ENV variables for dynamic module versions * Strip trailing whitespace from local resolvers script
1 parent ec67ff4 commit f633d7b

24 files changed

+140
-84
lines changed

‎.github/workflows/alpine-mainline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Parse Alpine version
2929
id: distro_version
3030
run: |
31-
echo "release=$(cat update.sh | grep -m6 '\[mainline\]=' | tail -n1 | cut -d"'" -f2)" >> "$GITHUB_OUTPUT"
31+
echo "release=$(cat update.sh | grep -m7 '\[mainline\]=' | tail -n1 | cut -d"'" -f2)" >> "$GITHUB_OUTPUT"
3232
3333
slim:
3434
name: Build Alpine NGINX mainline slim Docker image

‎.github/workflows/alpine-stable.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Parse Alpine version
2929
id: distro_version
3030
run: |
31-
echo "release=$(cat update.sh | grep -m6 '\[stable\]=' | tail -n1 | cut -d"'" -f2)" >> "$GITHUB_OUTPUT"
31+
echo "release=$(cat update.sh | grep -m7 '\[stable\]=' | tail -n1 | cut -d"'" -f2)" >> "$GITHUB_OUTPUT"
3232
3333
slim:
3434
name: Build Alpine NGINX stable slim Docker image

‎.github/workflows/debian-mainline.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Parse Debian version
2929
id: distro_version
3030
run: |
31-
echo "release=$(cat update.sh | grep -m5 '\[mainline\]=' | tail -n1 | cut -d"'" -f2)" >> "$GITHUB_OUTPUT"
31+
echo "release=$(cat update.sh | grep -m6 '\[mainline\]=' | tail -n1 | cut -d"'" -f2)" >> "$GITHUB_OUTPUT"
3232
3333
core:
3434
name: Build Debian NGINX mainline Docker image
@@ -110,7 +110,8 @@ jobs:
110110
id: build
111111
uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # v6.6.1
112112
with:
113-
platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
113+
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
114+
# platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
114115
context: "{{ defaultContext }}:mainline/debian"
115116
labels: ${{ steps.meta.outputs.labels }}
116117
annotations: ${{ steps.meta.outputs.annotations }}
@@ -228,7 +229,8 @@ jobs:
228229
id: build
229230
uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # v6.6.1
230231
with:
231-
platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
232+
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
233+
# platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
232234
context: "{{ defaultContext }}:mainline/debian-perl"
233235
labels: ${{ steps.meta.outputs.labels }}
234236
annotations: ${{ steps.meta.outputs.annotations }}

‎.github/workflows/debian-stable.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Parse Alpine version
2929
id: distro_version
3030
run: |
31-
echo "release=$(cat update.sh | grep -m5 '\[stable\]=' | tail -n1 | cut -d"'" -f2)" >> "$GITHUB_OUTPUT"
31+
echo "release=$(cat update.sh | grep -m6 '\[stable\]=' | tail -n1 | cut -d"'" -f2)" >> "$GITHUB_OUTPUT"
3232
3333
core:
3434
name: Build Debian NGINX stable Docker image
@@ -106,7 +106,8 @@ jobs:
106106
id: build
107107
uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # v6.6.1
108108
with:
109-
platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
109+
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
110+
# platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
110111
context: "{{ defaultContext }}:stable/debian"
111112
labels: ${{ steps.meta.outputs.labels }}
112113
annotations: ${{ steps.meta.outputs.annotations }}
@@ -216,7 +217,8 @@ jobs:
216217
id: build
217218
uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # v6.6.1
218219
with:
219-
platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
220+
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
221+
# platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
220222
context: "{{ defaultContext }}:stable/debian-perl"
221223
labels: ${{ steps.meta.outputs.labels }}
222224
annotations: ${{ steps.meta.outputs.annotations }}

‎Dockerfile-alpine-perl.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ RUN set -x \
3636
bash \
3737
alpine-sdk \
3838
findutils \
39+
curl \
3940
&& su nobody -s /bin/sh -c " \
4041
export HOME=${tempDir} \
4142
&& cd ${tempDir} \

‎Dockerfile-alpine-slim.template‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
55

66
ENV NGINX_VERSION=%%NGINX_VERSION%%
77
ENV PKG_RELEASE=%%PKG_RELEASE%%
8+
ENV DYNPKG_RELEASE=%%DYNPKG_RELEASE%%
89

910
ARG UID=101
1011
ARG GID=101
@@ -51,6 +52,7 @@ RUN set -x \
5152
bash \
5253
alpine-sdk \
5354
findutils \
55+
curl \
5456
&& su nobody -s /bin/sh -c " \
5557
export HOME=${tempDir} \
5658
&& cd ${tempDir} \

‎Dockerfile-alpine.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ RUN set -x \
4242
bash \
4343
alpine-sdk \
4444
findutils \
45+
curl \
4546
&& su nobody -s /bin/sh -c " \
4647
export HOME=${tempDir} \
4748
&& cd ${tempDir} \

‎Dockerfile-debian.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ENV NGINX_VERSION=%%NGINX_VERSION%%
77
ENV NJS_VERSION=%%NJS_VERSION%%
88
ENV NJS_RELEASE=%%NJS_RELEASE%%
99
ENV PKG_RELEASE=%%PKG_RELEASE%%
10+
ENV DYNPKG_RELEASE=%%DYNPKG_RELEASE%%
1011

1112
ARG UID=101
1213
ARG GID=101

‎entrypoint/15-local-resolvers.envsh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99
[ "${NGINX_ENTRYPOINT_LOCAL_RESOLVERS:-}" ] || return 0
1010

1111
NGINX_LOCAL_RESOLVERS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {if ($2 ~ ":") {print "["$2"]"} else {print $2}}' /etc/resolv.conf)
12+
13+
NGINX_LOCAL_RESOLVERS="${NGINX_LOCAL_RESOLVERS% }"
14+
1215
export NGINX_LOCAL_RESOLVERS

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 7 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-
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.0-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.1-alpine
77
FROM $IMAGE
88

99
ARG UID=101
@@ -15,10 +15,10 @@ RUN set -x \
1515
&& apkArch="$(cat /etc/apk/arch)" \
1616
&& nginxPackages=" \
1717
nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
18-
nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
19-
nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
20-
nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
21-
nginx-module-perl=${NGINX_VERSION}-r${PKG_RELEASE} \
18+
nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
19+
nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
20+
nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
21+
nginx-module-perl=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
2222
nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
2323
" \
2424
# install prerequisites for public key and pkg-oss checks
@@ -47,11 +47,12 @@ RUN set -x \
4747
bash \
4848
alpine-sdk \
4949
findutils \
50+
curl \
5051
&& su nobody -s /bin/sh -c " \
5152
export HOME=${tempDir} \
5253
&& cd ${tempDir} \
5354
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
54-
&& PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
55+
&& PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5556
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5657
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5758
else \

0 commit comments

Comments
 (0)