Skip to content

Commit fe8a041

Browse files
alessfgalessfg
committed
Update mainline NGINX to 1.23.3
1 parent 6d9b81f commit fe8a041

File tree

12 files changed

+56
-29
lines changed

12 files changed

+56
-29
lines changed

‎Dockerfile-alpine-perl.template

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
ARG IMAGE=nginxinc/nginx-unprivileged:%%NGINX_VERSION%%-alpine
22
FROM $IMAGE
33

4+
ARG UID=101
5+
ARG GID=101
6+
47
USER root
58

69
RUN set -x \

‎Dockerfile-alpine.template

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
ARG IMAGE=nginxinc/nginx-unprivileged:%%NGINX_VERSION%%-alpine-slim
22
FROM $IMAGE
33

4-
USER root
5-
64
ENV NJS_VERSION %%NJS_VERSION%%
75

6+
ARG UID=101
7+
ARG GID=101
8+
9+
USER root
10+
811
RUN set -x \
912
&& apkArch="$(cat /etc/apk/arch)" \
1013
&& nginxPackages="%%PACKAGES%%

‎Dockerfile-debian-perl.template

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
ARG IMAGE=nginxinc/nginx-unprivileged:%%NGINX_VERSION%%
22
FROM $IMAGE
33

4+
ARG UID=101
5+
ARG GID=101
6+
47
USER root
58

69
RUN set -x \

‎mainline/alpine-perl/Dockerfile

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

9+
ARG UID=101
10+
ARG GID=101
11+
912
USER root
1013

1114
RUN set -x \
@@ -57,16 +60,16 @@ RUN set -x \
5760
&& su nobody -s /bin/sh -c " \
5861
export HOME=${tempDir} \
5962
&& cd ${tempDir} \
60-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \
61-
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
62-
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64+
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6366
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6467
else \
6568
echo \"pkg-oss tarball checksum verification failed!\"; \
6669
exit 1; \
6770
fi \
68-
&& tar xzvf 756.tar.gz \
69-
&& cd pkg-oss-756 \
71+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7073
&& cd alpine \
7174
&& make module-perl \
7275
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine-slim/Dockerfile

Lines changed: 6 additions & 6 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.23.2
11+
ENV NGINX_VERSION 1.23.3
1212
ENV PKG_RELEASE 1
1313

1414
ARG UID=101
@@ -60,16 +60,16 @@ RUN set -x \
6060
&& su nobody -s /bin/sh -c " \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
63-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \
64-
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64+
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \
6868
echo \"pkg-oss tarball checksum verification failed!\"; \
6969
exit 1; \
7070
fi \
71-
&& tar xzvf 756.tar.gz \
72-
&& cd pkg-oss-756 \
71+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7373
&& cd alpine \
7474
&& make base \
7575
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/alpine/Dockerfile

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

9-
USER root
10-
119
ENV NJS_VERSION 0.7.9
1210

11+
ARG UID=101
12+
ARG GID=101
13+
14+
USER root
15+
1316
RUN set -x \
1417
&& apkArch="$(cat /etc/apk/arch)" \
1518
&& nginxPackages=" \
@@ -61,16 +64,16 @@ RUN set -x \
6164
&& su nobody -s /bin/sh -c " \
6265
export HOME=${tempDir} \
6366
&& cd ${tempDir} \
64-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/756.tar.gz \
65-
&& PKGOSSCHECKSUM=\"5e79f9be4f8ba037fa8138fe50a8fc9e41a0192c1d8c9b2cc58b5c5f5eb3ac66b4807083d25ca21363f07075320a7566eb3e4d3317aa01d3b3e23b20943c411f *756.tar.gz\" \
66-
&& if [ \"\$(openssl sha512 -r 756.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
67+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68+
&& PKGOSSCHECKSUM=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
69+
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6770
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6871
else \
6972
echo \"pkg-oss tarball checksum verification failed!\"; \
7073
exit 1; \
7174
fi \
72-
&& tar xzvf 756.tar.gz \
73-
&& cd pkg-oss-756 \
75+
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
76+
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
7477
&& cd alpine \
7578
&& make module-geoip module-image-filter module-njs module-xslt \
7679
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/debian-perl/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.23.2
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.23.3
77
FROM $IMAGE
88

9+
ARG UID=101
10+
ARG GID=101
11+
912
USER root
1013

1114
RUN set -x \

‎mainline/debian/Dockerfile

Lines changed: 1 addition & 1 deletion
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.23.2
11+
ENV NGINX_VERSION 1.23.3
1212
ENV NJS_VERSION 0.7.9
1313
ENV PKG_RELEASE 1~bullseye
1414

‎stable/alpine-perl/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1-alpine
77
FROM $IMAGE
88

9+
ARG UID=101
10+
ARG GID=101
11+
912
USER root
1013

1114
RUN set -x \

‎stable/alpine/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
ARG IMAGE=nginxinc/nginx-unprivileged:1.22.1-alpine-slim
77
FROM $IMAGE
88

9-
USER root
10-
119
ENV NJS_VERSION 0.7.9
1210

11+
ARG UID=101
12+
ARG GID=101
13+
14+
USER root
15+
1316
RUN set -x \
1417
&& apkArch="$(cat /etc/apk/arch)" \
1518
&& nginxPackages=" \

0 commit comments

Comments
 (0)