From fef51235521d1cdf8b05d8cb1378a526d2abf421 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@videolan.org>
Date: Wed, 19 Oct 2022 16:27:43 +0400
Subject: [PATCH] Updated NGINX to 1.22.1, 1.23.2, NJS to 0.7.7.
---
mainline/alpine-perl/Dockerfile | 6 +++---
mainline/alpine-slim/Dockerfile | 4 ++--
mainline/alpine/Dockerfile | 6 +++---
mainline/debian-perl/Dockerfile | 4 ++--
mainline/debian/Dockerfile | 4 ++--
stable/alpine-perl/Dockerfile | 14 +++++++-------
stable/alpine-slim/Dockerfile | 12 ++++++------
stable/alpine/Dockerfile | 14 +++++++-------
stable/debian-perl/Dockerfile | 4 ++--
stable/debian/Dockerfile | 4 ++--
update.sh | 14 +++++++-------
11 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile
index a67df4f..0308d51 100644
--- a/mainline/alpine-perl/Dockerfile
+++ b/mainline/alpine-perl/Dockerfile
@@ -7,8 +7,8 @@ FROM alpine:3.16
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.23.1
-ENV NJS_VERSION 0.7.6
+ENV NGINX_VERSION 1.23.2
+ENV NJS_VERSION 0.7.7
ENV PKG_RELEASE 1
RUN set -x \
@@ -68,7 +68,7 @@ RUN set -x \
export HOME=${tempDir} \
&& cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
- && PKGOSSCHECKSUM=\"513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+ && PKGOSSCHECKSUM=\"98d244d5dea3f0c49692843b1857e21dc7353e749f9ff8a526036a3beeea299e156183b6a98070ffc68a23d191e1f24c577d7ea874f8cc27ce01f4dc832658b6 *${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 \
diff --git a/mainline/alpine-slim/Dockerfile b/mainline/alpine-slim/Dockerfile
index b5cfded..737f738 100644
--- a/mainline/alpine-slim/Dockerfile
+++ b/mainline/alpine-slim/Dockerfile
@@ -7,7 +7,7 @@ FROM alpine:3.16
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.23.1
+ENV NGINX_VERSION 1.23.2
ENV PKG_RELEASE 1
RUN set -x \
@@ -57,7 +57,7 @@ RUN set -x \
export HOME=${tempDir} \
&& cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
- && PKGOSSCHECKSUM=\"513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+ && PKGOSSCHECKSUM=\"98d244d5dea3f0c49692843b1857e21dc7353e749f9ff8a526036a3beeea299e156183b6a98070ffc68a23d191e1f24c577d7ea874f8cc27ce01f4dc832658b6 *${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 \
diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile
index d8a995b..7aebcf8 100644
--- a/mainline/alpine/Dockerfile
+++ b/mainline/alpine/Dockerfile
@@ -7,8 +7,8 @@ FROM alpine:3.16
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.23.1
-ENV NJS_VERSION 0.7.6
+ENV NGINX_VERSION 1.23.2
+ENV NJS_VERSION 0.7.7
ENV PKG_RELEASE 1
RUN set -x \
@@ -67,7 +67,7 @@ RUN set -x \
export HOME=${tempDir} \
&& cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
- && PKGOSSCHECKSUM=\"513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+ && PKGOSSCHECKSUM=\"98d244d5dea3f0c49692843b1857e21dc7353e749f9ff8a526036a3beeea299e156183b6a98070ffc68a23d191e1f24c577d7ea874f8cc27ce01f4dc832658b6 *${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 \
diff --git a/mainline/debian-perl/Dockerfile b/mainline/debian-perl/Dockerfile
index a0a4c59..913ee5f 100644
--- a/mainline/debian-perl/Dockerfile
+++ b/mainline/debian-perl/Dockerfile
@@ -7,8 +7,8 @@ FROM debian:bullseye-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.23.1
-ENV NJS_VERSION 0.7.6
+ENV NGINX_VERSION 1.23.2
+ENV NJS_VERSION 0.7.7
ENV PKG_RELEASE 1~bullseye
RUN set -x \
diff --git a/mainline/debian/Dockerfile b/mainline/debian/Dockerfile
index dd378e7..cd819d0 100644
--- a/mainline/debian/Dockerfile
+++ b/mainline/debian/Dockerfile
@@ -7,8 +7,8 @@ FROM debian:bullseye-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.23.1
-ENV NJS_VERSION 0.7.6
+ENV NGINX_VERSION 1.23.2
+ENV NJS_VERSION 0.7.7
ENV PKG_RELEASE 1~bullseye
RUN set -x \
diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile
index 50cac38..52ac64c 100644
--- a/stable/alpine-perl/Dockerfile
+++ b/stable/alpine-perl/Dockerfile
@@ -7,8 +7,8 @@ FROM alpine:3.16
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.22.0
-ENV NJS_VERSION 0.7.6
+ENV NGINX_VERSION 1.22.1
+ENV NJS_VERSION 0.7.7
ENV PKG_RELEASE 1
RUN set -x \
@@ -67,16 +67,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/725.tar.gz \
- && PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \
- && if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+ && PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${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 725.tar.gz \
- && cd pkg-oss-725 \
+ && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+ && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
&& cd alpine \
&& make all \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
diff --git a/stable/alpine-slim/Dockerfile b/stable/alpine-slim/Dockerfile
index 8f54853..3244126 100644
--- a/stable/alpine-slim/Dockerfile
+++ b/stable/alpine-slim/Dockerfile
@@ -7,7 +7,7 @@ FROM alpine:3.16
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.22.0
+ENV NGINX_VERSION 1.22.1
ENV PKG_RELEASE 1
RUN set -x \
@@ -56,16 +56,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/725.tar.gz \
- && PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \
- && if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+ && PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${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 725.tar.gz \
- && cd pkg-oss-725 \
+ && 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 \
diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile
index 4bec54d..2e27da1 100644
--- a/stable/alpine/Dockerfile
+++ b/stable/alpine/Dockerfile
@@ -7,8 +7,8 @@ FROM alpine:3.16
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.22.0
-ENV NJS_VERSION 0.7.6
+ENV NGINX_VERSION 1.22.1
+ENV NJS_VERSION 0.7.7
ENV PKG_RELEASE 1
RUN set -x \
@@ -66,16 +66,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/725.tar.gz \
- && PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \
- && if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
+ && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+ && PKGOSSCHECKSUM=\"7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25 *${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 725.tar.gz \
- && cd pkg-oss-725 \
+ && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+ && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
&& cd alpine \
&& make all \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
diff --git a/stable/debian-perl/Dockerfile b/stable/debian-perl/Dockerfile
index fac18e5..c72c928 100644
--- a/stable/debian-perl/Dockerfile
+++ b/stable/debian-perl/Dockerfile
@@ -7,8 +7,8 @@ FROM debian:bullseye-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.22.0
-ENV NJS_VERSION 0.7.6
+ENV NGINX_VERSION 1.22.1
+ENV NJS_VERSION 0.7.7
ENV PKG_RELEASE 1~bullseye
RUN set -x \
diff --git a/stable/debian/Dockerfile b/stable/debian/Dockerfile
index 48258ba..da4872d 100644
--- a/stable/debian/Dockerfile
+++ b/stable/debian/Dockerfile
@@ -7,8 +7,8 @@ FROM debian:bullseye-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.22.0
-ENV NJS_VERSION 0.7.6
+ENV NGINX_VERSION 1.22.1
+ENV NJS_VERSION 0.7.7
ENV PKG_RELEASE 1~bullseye
RUN set -x \
diff --git a/update.sh b/update.sh
index ddb783e..7cad389 100755
--- a/update.sh
+++ b/update.sh
@@ -12,14 +12,14 @@ declare branches=(
# Current nginx versions
# Remember to update pkgosschecksum when changing this.
declare -A nginx=(
- [mainline]='1.23.1'
- [stable]='1.22.0'
+ [mainline]='1.23.2'
+ [stable]='1.22.1'
)
# Current njs versions
declare -A njs=(
- [mainline]='0.7.6'
- [stable]='0.7.6'
+ [mainline]='0.7.7'
+ [stable]='0.7.7'
)
# Current package patchlevel version
@@ -45,15 +45,15 @@ declare -A alpine=(
# Remember to update pkgosschecksum when changing this.
declare -A rev=(
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
- [stable]='725'
+ [stable]='${NGINX_VERSION}-${PKG_RELEASE}'
)
# 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]='513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd'
- [stable]='a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3'
+ [mainline]='98d244d5dea3f0c49692843b1857e21dc7353e749f9ff8a526036a3beeea299e156183b6a98070ffc68a23d191e1f24c577d7ea874f8cc27ce01f4dc832658b6'
+ [stable]='7266f418dcc9d89a2990f504d99ec58d10febbaf078c03630d42843955cee7e50b0f90fb317360384a32473839dc42d8b329b737015ec8dd0d028f90d4d5ed25'
)
get_packages() {
--
GitLab