Skip to content

Commit

Permalink
Update mainline NGINX to 1.23.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@alessfg
alessfg committed Dec 21, 2022
1 parent 6d9b81f commit fe8a041
Show file tree
Hide file tree
Showing 12 changed files with 56 additions and 29 deletions.
3 changes: 3 additions & 0 deletions Dockerfile-alpine-perl.template
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ARG IMAGE=nginxinc/nginx-unprivileged:%%NGINX_VERSION%%-alpine
FROM $IMAGE

ARG UID=101
ARG GID=101

USER root

RUN set -x \
Expand Down
7 changes: 5 additions & 2 deletions Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
ARG IMAGE=nginxinc/nginx-unprivileged:%%NGINX_VERSION%%-alpine-slim
FROM $IMAGE

USER root

ENV NJS_VERSION %%NJS_VERSION%%

ARG UID=101
ARG GID=101

USER root

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
&& nginxPackages="%%PACKAGES%%
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile-debian-perl.template
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ARG IMAGE=nginxinc/nginx-unprivileged:%%NGINX_VERSION%%
FROM $IMAGE

ARG UID=101
ARG GID=101

USER root

RUN set -x \
Expand Down
15 changes: 9 additions & 6 deletions mainline/alpine-perl/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
ARG IMAGE=nginxinc/nginx-unprivileged:1.23.2-alpine
ARG IMAGE=nginxinc/nginx-unprivileged:1.23.3-alpine
FROM $IMAGE

ARG UID=101
ARG GID=101

USER root

RUN set -x \
Expand Down Expand Up @@ -57,16 +60,16 @@ RUN set -x \
&& su nobody -s /bin/sh -c " \
export HOME=${tempDir} \
&& cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
&& tar xzvf 756.tar.gz \
&& cd pkg-oss-756 \
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
&& cd alpine \
&& make module-perl \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
Expand Down
12 changes: 6 additions & 6 deletions mainline/alpine-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM $IMAGE

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

ENV NGINX_VERSION 1.23.2
ENV NGINX_VERSION 1.23.3
ENV PKG_RELEASE 1

ARG UID=101
Expand Down Expand Up @@ -60,16 +60,16 @@ RUN set -x \
&& su nobody -s /bin/sh -c " \
export HOME=${tempDir} \
&& cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
&& tar xzvf 756.tar.gz \
&& cd pkg-oss-756 \
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
&& cd alpine \
&& make base \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
Expand Down
19 changes: 11 additions & 8 deletions mainline/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
ARG IMAGE=nginxinc/nginx-unprivileged:1.23.2-alpine-slim
ARG IMAGE=nginxinc/nginx-unprivileged:1.23.3-alpine-slim
FROM $IMAGE

USER root

ENV NJS_VERSION 0.7.9

ARG UID=101
ARG GID=101

USER root

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
&& nginxPackages=" \
Expand Down Expand Up @@ -61,16 +64,16 @@ RUN set -x \
&& su nobody -s /bin/sh -c " \
export HOME=${tempDir} \
&& cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
&& tar xzvf 756.tar.gz \
&& cd pkg-oss-756 \
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
&& cd alpine \
&& make module-geoip module-image-filter module-njs module-xslt \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
Expand Down
5 changes: 4 additions & 1 deletion mainline/debian-perl/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
ARG IMAGE=nginxinc/nginx-unprivileged:1.23.2
ARG IMAGE=nginxinc/nginx-unprivileged:1.23.3
FROM $IMAGE

ARG UID=101
ARG GID=101

USER root

RUN set -x \
Expand Down
2 changes: 1 addition & 1 deletion mainline/debian/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM $IMAGE

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

ENV NGINX_VERSION 1.23.2
ENV NGINX_VERSION 1.23.3
ENV NJS_VERSION 0.7.9
ENV PKG_RELEASE 1~bullseye

Expand Down
3 changes: 3 additions & 0 deletions stable/alpine-perl/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1-alpine
FROM $IMAGE

ARG UID=101
ARG GID=101

USER root

RUN set -x \
Expand Down
7 changes: 5 additions & 2 deletions stable/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@
ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1-alpine-slim
FROM $IMAGE

USER root

ENV NJS_VERSION 0.7.9

ARG UID=101
ARG GID=101

USER root

RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
&& nginxPackages=" \
Expand Down
3 changes: 3 additions & 0 deletions stable/debian-perl/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1
FROM $IMAGE

ARG UID=101
ARG GID=101

USER root

RUN set -x \
Expand Down
6 changes: 3 additions & 3 deletions update.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ declare branches=(
# Current nginx versions
# Remember to update pkgosschecksum when changing this.
declare -A nginx=(
[mainline]='1.23.2'
[mainline]='1.23.3'
[stable]='1.22.1'
)

Expand Down Expand Up @@ -44,15 +44,15 @@ declare -A alpine=(
# when building alpine packages on architectures not supported by nginx.org
# Remember to update pkgosschecksum when changing this.
declare -A rev=(
[mainline]='756'
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
[stable]='757'
)

# Holds SHA512 checksum for the pkg-oss tarball produced by source code
# revision/tag in the previous block
# Used in alpine builds for architectures not packaged by nginx.org
declare -A pkgosschecksum=(
[mainline]='5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f'
[mainline]='52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990'
[stable]='32a039e8d3cc54404a8ad4a31981e76a49632f1ebec2f45bb309689d6ba2f82e3e8aea8abf582b49931636ea53271b48a7e2f2ef8ebe35b167b3fe18b8b99852'
)

Expand Down

0 comments on commit fe8a041

Please sign in to comment.