Skip to content

Commit 3a95eb5

Browse files
alessfgalessfg
committed
Update Alpine to 3.18
* And NJS to 0.8.0
1 parent 5500bc6 commit 3a95eb5

File tree

9 files changed

+44
-44
lines changed

9 files changed

+44
-44
lines changed

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"dd08a5c2b441817d58ffc91ade0d927a21bc9854c768391e92a005997a2961bcda64ca6a5cfce98d5394ac2787c8f4839b150f206835a8a7db944625651f9fd8 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/e0da7da2b70a.tar.gz \
64+
&& PKGOSSCHECKSUM=\"147d7cce3f47d4dbd7bbce8da3199943e15ba64d4be44f603bd90286f8d38320ad027bfa8506a00ca84964b763c19c4ab1d504f586cfc7798518df97700ab1a3 *e0da7da2b70a.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r e0da7da2b70a.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 ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
71+
&& tar xzvf e0da7da2b70a.tar.gz \
72+
&& cd pkg-oss-e0da7da2b70a \
7373
&& cd alpine \
7474
&& make module-perl \
7575
&& 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
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=alpine:3.17
6+
ARG IMAGE=alpine:3.18
77
FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
@@ -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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"dd08a5c2b441817d58ffc91ade0d927a21bc9854c768391e92a005997a2961bcda64ca6a5cfce98d5394ac2787c8f4839b150f206835a8a7db944625651f9fd8 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/e0da7da2b70a.tar.gz \
64+
&& PKGOSSCHECKSUM=\"147d7cce3f47d4dbd7bbce8da3199943e15ba64d4be44f603bd90286f8d38320ad027bfa8506a00ca84964b763c19c4ab1d504f586cfc7798518df97700ab1a3 *e0da7da2b70a.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r e0da7da2b70a.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 ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
71+
&& tar xzvf e0da7da2b70a.tar.gz \
72+
&& cd pkg-oss-e0da7da2b70a \
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.1-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION 0.7.12
9+
ENV NJS_VERSION 0.8.0
1010

1111
ARG UID=101
1212
ARG GID=101
@@ -64,16 +64,16 @@ RUN set -x \
6464
&& su nobody -s /bin/sh -c " \
6565
export HOME=${tempDir} \
6666
&& cd ${tempDir} \
67-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68-
&& PKGOSSCHECKSUM=\"dd08a5c2b441817d58ffc91ade0d927a21bc9854c768391e92a005997a2961bcda64ca6a5cfce98d5394ac2787c8f4839b150f206835a8a7db944625651f9fd8 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
69-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
67+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/e0da7da2b70a.tar.gz \
68+
&& PKGOSSCHECKSUM=\"147d7cce3f47d4dbd7bbce8da3199943e15ba64d4be44f603bd90286f8d38320ad027bfa8506a00ca84964b763c19c4ab1d504f586cfc7798518df97700ab1a3 *e0da7da2b70a.tar.gz\" \
69+
&& if [ \"\$(openssl sha512 -r e0da7da2b70a.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7070
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7171
else \
7272
echo \"pkg-oss tarball checksum verification failed!\"; \
7373
exit 1; \
7474
fi \
75-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
76-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
75+
&& tar xzvf e0da7da2b70a.tar.gz \
76+
&& cd pkg-oss-e0da7da2b70a \
7777
&& cd alpine \
7878
&& make module-geoip module-image-filter module-njs module-xslt \
7979
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎mainline/debian/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ FROM $IMAGE
99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

1111
ENV NGINX_VERSION 1.25.1
12-
ENV NJS_VERSION 0.7.12
12+
ENV NJS_VERSION 0.8.0
1313
ENV PKG_RELEASE 1~bookworm
1414

1515
ARG UID=101

‎stable/alpine-perl/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/e5d85b3424bb.tar.gz \
64+
&& PKGOSSCHECKSUM=\"4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b *e5d85b3424bb.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r e5d85b3424bb.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 ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
71+
&& tar xzvf e5d85b3424bb.tar.gz \
72+
&& cd pkg-oss-e5d85b3424bb \
7373
&& cd alpine \
7474
&& make module-perl \
7575
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine-slim/Dockerfile‎

Lines changed: 6 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=alpine:3.17
6+
ARG IMAGE=alpine:3.18
77
FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
@@ -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/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
63+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/e5d85b3424bb.tar.gz \
64+
&& PKGOSSCHECKSUM=\"4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b *e5d85b3424bb.tar.gz\" \
65+
&& if [ \"\$(openssl sha512 -r e5d85b3424bb.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 ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
72-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
71+
&& tar xzvf e5d85b3424bb.tar.gz \
72+
&& cd pkg-oss-e5d85b3424bb \
7373
&& cd alpine \
7474
&& make base \
7575
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/alpine/Dockerfile‎

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

9-
ENV NJS_VERSION 0.7.12
9+
ENV NJS_VERSION 0.8.0
1010

1111
ARG UID=101
1212
ARG GID=101
@@ -64,16 +64,16 @@ RUN set -x \
6464
&& su nobody -s /bin/sh -c " \
6565
export HOME=${tempDir} \
6666
&& cd ${tempDir} \
67-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68-
&& PKGOSSCHECKSUM=\"dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
69-
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
67+
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/e5d85b3424bb.tar.gz \
68+
&& PKGOSSCHECKSUM=\"4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b *e5d85b3424bb.tar.gz\" \
69+
&& if [ \"\$(openssl sha512 -r e5d85b3424bb.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7070
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7171
else \
7272
echo \"pkg-oss tarball checksum verification failed!\"; \
7373
exit 1; \
7474
fi \
75-
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
76-
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
75+
&& tar xzvf e5d85b3424bb.tar.gz \
76+
&& cd pkg-oss-e5d85b3424bb \
7777
&& cd alpine \
7878
&& make module-geoip module-image-filter module-njs module-xslt \
7979
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

‎stable/debian/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ FROM $IMAGE
99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

1111
ENV NGINX_VERSION 1.24.0
12-
ENV NJS_VERSION 0.7.12
12+
ENV NJS_VERSION 0.8.0
1313
ENV PKG_RELEASE 1~bullseye
1414

1515
ARG UID=101

‎update.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ declare -A nginx=(
1818

1919
# Current njs versions
2020
declare -A njs=(
21-
[mainline]='0.7.12'
22-
[stable]='0.7.12'
21+
[mainline]='0.8.0'
22+
[stable]='0.8.0'
2323
)
2424

2525
# Current package patchlevel version
@@ -35,25 +35,25 @@ declare -A debian=(
3535
)
3636

3737
declare -A alpine=(
38-
[mainline]='3.17'
39-
[stable]='3.17'
38+
[mainline]='3.18'
39+
[stable]='3.18'
4040
)
4141

4242
# When we bump njs version in a stable release we don't move the tag in the
4343
# mercurial repo. This setting allows us to specify a revision to check out
4444
# when building alpine packages on architectures not supported by nginx.org
4545
# Remember to update pkgosschecksum when changing this.
4646
declare -A rev=(
47-
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
48-
[stable]='${NGINX_VERSION}-${PKG_RELEASE}'
47+
[mainline]='e0da7da2b70a'
48+
[stable]='e5d85b3424bb'
4949
)
5050

5151
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
5252
# revision/tag in the previous block
5353
# Used in alpine builds for architectures not packaged by nginx.org
5454
declare -A pkgosschecksum=(
55-
[mainline]='dd08a5c2b441817d58ffc91ade0d927a21bc9854c768391e92a005997a2961bcda64ca6a5cfce98d5394ac2787c8f4839b150f206835a8a7db944625651f9fd8'
56-
[stable]='dc47dbaeb1c0874b264d34ddfec40e7d2b814e7db48d144e12d5991c743ef5fcf780ecbab72324e562dd84bb9c0e4dd71d14850b20ceaf470c46f8fe7510275b'
55+
[mainline]='147d7cce3f47d4dbd7bbce8da3199943e15ba64d4be44f603bd90286f8d38320ad027bfa8506a00ca84964b763c19c4ab1d504f586cfc7798518df97700ab1a3'
56+
[stable]='4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b'
5757
)
5858

5959
get_packages() {

0 commit comments

Comments
 (0)