From 73a5acae6945b75b433cafd0c9318e4378e72cbb Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@videolan.org>
Date: Tue, 28 Mar 2023 12:14:25 -0700
Subject: [PATCH] Updated mainline nginx to 1.23.4.
---
mainline/alpine-perl/Dockerfile | 4 ++--
mainline/alpine-slim/Dockerfile | 4 ++--
mainline/alpine/Dockerfile | 6 +++---
mainline/debian-perl/Dockerfile | 2 +-
mainline/debian/Dockerfile | 4 ++--
update.sh | 6 +++---
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile
index 4cc786d..134f445 100644
--- a/mainline/alpine-perl/Dockerfile
+++ b/mainline/alpine-perl/Dockerfile
@@ -3,7 +3,7 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM nginx:1.23.3-alpine
+FROM nginx:1.23.4-alpine
RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
@@ -55,7 +55,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=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+ && PKGOSSCHECKSUM=\"8f3f6c1ddd984c0c7320d3bea25eee42749db6d69c251223cf91d69b8d80b703ab39eb94fcf731399a7693ebd8dd37d1b3232ea1184ca98e5ca0ba6165e1a05c *${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 89ad641..f35e861 100644
--- a/mainline/alpine-slim/Dockerfile
+++ b/mainline/alpine-slim/Dockerfile
@@ -7,7 +7,7 @@ FROM alpine:3.17
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV NGINX_VERSION 1.23.3
+ENV NGINX_VERSION 1.23.4
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=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+ && PKGOSSCHECKSUM=\"8f3f6c1ddd984c0c7320d3bea25eee42749db6d69c251223cf91d69b8d80b703ab39eb94fcf731399a7693ebd8dd37d1b3232ea1184ca98e5ca0ba6165e1a05c *${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 68eacfd..bb064be 100644
--- a/mainline/alpine/Dockerfile
+++ b/mainline/alpine/Dockerfile
@@ -3,9 +3,9 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM nginx:1.23.3-alpine-slim
+FROM nginx:1.23.4-alpine-slim
-ENV NJS_VERSION 0.7.9
+ENV NJS_VERSION 0.7.11
RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
@@ -59,7 +59,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=\"52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
+ && PKGOSSCHECKSUM=\"8f3f6c1ddd984c0c7320d3bea25eee42749db6d69c251223cf91d69b8d80b703ab39eb94fcf731399a7693ebd8dd37d1b3232ea1184ca98e5ca0ba6165e1a05c *${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 fc30441..44ac453 100644
--- a/mainline/debian-perl/Dockerfile
+++ b/mainline/debian-perl/Dockerfile
@@ -3,7 +3,7 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM nginx:1.23.3
+FROM nginx:1.23.4
RUN set -x \
&& apt-get update \
diff --git a/mainline/debian/Dockerfile b/mainline/debian/Dockerfile
index e3e3f84..31b1387 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.3
-ENV NJS_VERSION 0.7.9
+ENV NGINX_VERSION 1.23.4
+ENV NJS_VERSION 0.7.11
ENV PKG_RELEASE 1~bullseye
RUN set -x \
diff --git a/update.sh b/update.sh
index 662ff7f..4c059b9 100755
--- a/update.sh
+++ b/update.sh
@@ -12,13 +12,13 @@ declare branches=(
# Current nginx versions
# Remember to update pkgosschecksum when changing this.
declare -A nginx=(
- [mainline]='1.23.3'
+ [mainline]='1.23.4'
[stable]='1.22.1'
)
# Current njs versions
declare -A njs=(
- [mainline]='0.7.9'
+ [mainline]='0.7.11'
[stable]='0.7.9'
)
@@ -52,7 +52,7 @@ declare -A rev=(
# revision/tag in the previous block
# Used in alpine builds for architectures not packaged by nginx.org
declare -A pkgosschecksum=(
- [mainline]='52a80f6c3b3914462f8a0b2fbadea950bcd79c1bd528386aff4c28d5a80c6920d783575a061a47b60fea800eef66bf5a0178a137ea51c37277fe9c2779715990'
+ [mainline]='8f3f6c1ddd984c0c7320d3bea25eee42749db6d69c251223cf91d69b8d80b703ab39eb94fcf731399a7693ebd8dd37d1b3232ea1184ca98e5ca0ba6165e1a05c'
[stable]='32a039e8d3cc54404a8ad4a31981e76a49632f1ebec2f45bb309689d6ba2f82e3e8aea8abf582b49931636ea53271b48a7e2f2ef8ebe35b167b3fe18b8b99852'
)
--
GitLab