From ee6b833b5d9d1966b85a5d318efc04cf8b1c1ba5 Mon Sep 17 00:00:00 2001
From: Luca Comellini <luca.com@gmail.com>
Date: Tue, 23 May 2023 15:13:44 -0700
Subject: [PATCH] Bump NGINX mainline to 1.25.0, NJS to 0.7.12
---
mainline/alpine-perl/Dockerfile | 2 +-
mainline/alpine-slim/Dockerfile | 2 +-
mainline/alpine/Dockerfile | 4 ++--
mainline/debian-perl/Dockerfile | 2 +-
mainline/debian/Dockerfile | 4 ++--
update.sh | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile
index 134f445..9a97a76 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.4-alpine
+FROM nginx:1.25.0-alpine
RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
diff --git a/mainline/alpine-slim/Dockerfile b/mainline/alpine-slim/Dockerfile
index f35e861..cfac0da 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.4
+ENV NGINX_VERSION 1.25.0
ENV PKG_RELEASE 1
RUN set -x \
diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile
index bb064be..e02bf1e 100644
--- a/mainline/alpine/Dockerfile
+++ b/mainline/alpine/Dockerfile
@@ -3,9 +3,9 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM nginx:1.23.4-alpine-slim
+FROM nginx:1.25.0-alpine-slim
-ENV NJS_VERSION 0.7.11
+ENV NJS_VERSION 0.7.12
RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \
diff --git a/mainline/debian-perl/Dockerfile b/mainline/debian-perl/Dockerfile
index 44ac453..fe8ab0e 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.4
+FROM nginx:1.25.0
RUN set -x \
&& apt-get update \
diff --git a/mainline/debian/Dockerfile b/mainline/debian/Dockerfile
index 31b1387..c3ccd5d 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.4
-ENV NJS_VERSION 0.7.11
+ENV NGINX_VERSION 1.25.0
+ENV NJS_VERSION 0.7.12
ENV PKG_RELEASE 1~bullseye
RUN set -x \
diff --git a/update.sh b/update.sh
index e545c72..36e7cc0 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.4'
+ [mainline]='1.25.0'
[stable]='1.24.0'
)
# Current njs versions
declare -A njs=(
- [mainline]='0.7.11'
+ [mainline]='0.7.12'
[stable]='0.7.12'
)
--
GitLab