[Nginx] Update version to v1.25.1

Signed-off-by: Kang Huaishuai <[email protected]>

.env.example

@@ -98,8 +98,8 @@ LNMP_MYSQL_PORT_X=127.0.0.1:33060
 
 # [Redis]
 
-LNMP_REDIS_PORT=127.0.0.1:6379
-# LNMP_REDIS_PORT=0.0.0.0:6379
+LNMP_REDIS_PORT=127.0.0.1:16379
+# LNMP_REDIS_PORT=0.0.0.0:16379
 
 # [Memcached]
 
@@ -118,7 +118,8 @@ TZ=Asia/Shanghai
 
 # [Version]
 
-LNMP_NGINX_VERSION=1.23.3
+# https://nginx.org/en/CHANGES
+LNMP_NGINX_VERSION=1.25.1
 
 LNMP_MYSQL_VERSION=8.0.33
 

CHANGELOG.md

@@ -15,3 +15,4 @@
 ### Updates:
 
 * [PHP `8.2.5` `8.1.15` `8.0.28`](https://www.php.net/ChangeLog-8.php#8.1.15)
+* [Nginx `1.25.1`](https://nginx.org/en/CHANGES)

README.cn.md

@@ -201,7 +201,7 @@ $ ./lnmp-docker down
 |Name|Docker Image|Version|Based|
 |:-- |:--         |:--    |:--  |
 |[ACME.sh](https://github.com/acmesh-official/acme.sh)                     |`khs1994/acme:3.0.0`            | **3.0.0**           |`alpine:3.16`    |
-|[NGINX](https://github.com/khs1994-docker/nginx)                          |`nginx:1.23.3-alpine`           | **1.23.3**          |`alpine:3.13`    |
+|[NGINX](https://github.com/khs1994-docker/nginx)                          |`nginx:1.25.1-alpine`           | **1.25.1**          |`alpine:3.13`    |
 |[NGINX Unit](https://github.com/nginx/unit)                               |`khs1994/php:8.2.5-unit-alpine`| **1.30.0**          |`alpine:3.16`    |
 |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd)         |`httpd:2.4.53-alpine`           | **2.4.53**          |`alpine:3.16`    |
 |[MySQL](https://github.com/docker-library/docs/tree/master/mysql)         |`mysql:8.0.33`                  | **8.0.33**          |`oraclelinux:8-slim`|

README.md

@@ -196,7 +196,7 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#%
 |Name|Docker Image|Version|Based|
 |:-- |:--         |:--    |:--  |
 |[ACME.sh](https://github.com/acmesh-official/acme.sh)                     |`khs1994/acme:3.0.0`           | **3.0.0**           |`alpine:3.16`    |
-|[NGINX](https://github.com/khs1994-docker/nginx)                          |`nginx:1.23.3-alpine`           | **1.23.3**          |`alpine:3.13`    |
+|[NGINX](https://github.com/khs1994-docker/nginx)                          |`nginx:1.25.1-alpine`           | **1.25.1**          |`alpine:3.13`    |
 |[NGINX Unit](https://github.com/nginx/unit)                               |`khs1994/php:8.2.5-unit-alpine`| **1.30.0**          |`alpine:3.16`    |
 |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd)         |`httpd:2.4.53-alpine`           | **2.4.53**          |`alpine:3.16`    |
 |[MySQL](https://github.com/docker-library/docs/tree/master/mysql)         |`mysql:8.0.33`                  | **8.0.33**          |`oraclelinux:8-slim`|

app/laravel-demo/Dockerfile

@@ -15,7 +15,7 @@
 
 ARG NODE_VERSION=18.2.0
 ARG PHP_VERSION=8.2.5
-ARG NGINX_VERSION=1.23.3-alpine
+ARG NGINX_VERSION=1.25.1-alpine
 ARG DOCKER_HUB_USERNAME=khs1994
 
 # 2.安装 composer 依赖

app/laravel-demo/Dockerfile.buildkit

@@ -17,7 +17,7 @@
 
 ARG NODE_VERSION=18.2.0
 ARG PHP_VERSION=8.2.5
-ARG NGINX_VERSION=1.23.3-alpine
+ARG NGINX_VERSION=1.25.1-alpine
 ARG DOCKER_HUB_USERNAME=khs1994
 
 # 2.安装 composer 依赖

app/laravel-demo/Dockerfile.cdn

@@ -16,7 +16,7 @@
 # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.cdn --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false .
 
 ARG PHP_VERSION=8.2.5
-ARG NGINX_VERSION=1.23.3-alpine
+ARG NGINX_VERSION=1.25.1-alpine
 ARG DOCKER_HUB_USERNAME=khs1994
 
 # 2.安装 composer 依赖

docker-lnmp.yml

@@ -265,7 +265,7 @@ services:
 
   nginx:
     << : [*common,*common-labels]
-    image: "${LNMP_LIBRARY_NS:-library}/nginx:${LNMP_NGINX_VERSION:-1.23.3}-alpine"
+    image: "${LNMP_LIBRARY_NS:-library}/nginx:${LNMP_NGINX_VERSION:-1.25.1}-alpine"
     ports:
       - "${LNMP_NGINX_HTTPS_PORT:-0.0.0.0:443}:443/udp"
       - "${LNMP_NGINX_HTTPS_PORT:-0.0.0.0:443}:443/tcp"

docker-production.yml

@@ -419,8 +419,8 @@ services:
       # context: ./dockerfile/nginx/
       context: ./config/nginx
       dockerfile: Dockerfile
-    image: nginx:1.23.3-alpine
-    # image: khs1994/nginx:1.23.3-alpine
+    image: nginx:1.25.1-alpine
+    # image: khs1994/nginx:1.25.1-alpine
     ports:
       - "443:443/tcp"
       - "443:443/udp"

dockerfile/nginx/.env.example

@@ -1 +1 @@
-NGINX_VERSION=1.23.3
+NGINX_VERSION=1.25.1

dockerfile/nginx/README.md

@@ -36,7 +36,7 @@ version: "3"
 
 services:
   nginx:
-    image: "khs1994/nginx:1.23.3-alpine"
+    image: "khs1994/nginx:1.25.1-alpine"
     ports:
       - "80:80"
       - "443:443/tcp"
@@ -57,7 +57,7 @@ $ docker run -dit \
          -p 443:443/udp \
          -v $PWD/app:/app \
          -v $PWD/conf.d:/etc/nginx/conf.d \
-         khs1994/nginx:1.23.3-alpine
+         khs1994/nginx:1.25.1-alpine
 ```
 
 # Who use it?

dockerfile/nginx/alpine/Dockerfile

@@ -34,7 +34,7 @@ FROM alpine:3.16
 
 LABEL maintainer="khs1994.com nginx With HTTP3"
 
-ARG NGINX_VERSION=1.23.3
+ARG NGINX_VERSION=1.25.1
 
 ARG ALPINE_URL=dl-cdn.alpinelinux.org
 

dockerfile/nginx/buster/Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:buster-slim
 
-ARG NGINX_VERSION=1.23.3
+ARG NGINX_VERSION=1.25.1
 
 ARG DEB_URL=deb.debian.org
 

dockerfile/nginx/docker-compose.yml

@@ -6,10 +6,10 @@ services:
       context: ./alpine
       args:
         # OPENSSL_BRANCH: master
-        NGINX_VERSION: ${NGINX_VERSION:-1.23.3}
+        NGINX_VERSION: ${NGINX_VERSION:-1.25.1}
         ALPINE_URL: mirrors.aliyun.com # dl-cdn.alpinelinux.org
         OPENSSL_URL: https://jackfan.us.kg.cnpmjs.org/google/boringssl
-    image: khs1994/nginx:${NGINX_VERSION:-1.23.3}-alpine
+    image: khs1994/nginx:${NGINX_VERSION:-1.25.1}-alpine
     ports:
       - 443:443/tcp
       - 443:443/udp
@@ -23,11 +23,11 @@ services:
       context: ./buster
       args:
         # OPENSSL_BRANCH: master
-        NGINX_VERSION: ${NGINX_VERSION:-1.23.3}
+        NGINX_VERSION: ${NGINX_VERSION:-1.25.1}
         OPENSSL_URL: https://jackfan.us.kg.cnpmjs.org/google/boringssl
         DEB_URL: mirrors.ustc.edu.cn # deb.debian.org
         DEB_SECURITY_URL: mirrors.ustc.edu.cn/debian-security # security.debian.org/debian-security
-    image: khs1994/nginx:${NGINX_VERSION:-1.23.3}-buster
+    image: khs1994/nginx:${NGINX_VERSION:-1.25.1}-buster
     ports:
       - 443:443/tcp
       - 443:443/udp
@@ -36,7 +36,7 @@ services:
       - ./conf.d:/etc/nginx/conf.d:ro
 
   official:
-    image: nginx:1.23.3-alpine
+    image: nginx:1.25.1-alpine
     ports:
       - 443:443
       - 80:80

dockerfile/sync/docker-image-sync.json

@@ -156,12 +156,12 @@
     "dest": "library-mirror/nginx:alpine"
   },
   {
-    "source": "library/nginx:1.22.1-alpine",
-    "dest": "library-mirror/nginx:1.22.1-alpine"
+    "source": "library/nginx:1.24.0-alpine",
+    "dest": "library-mirror/nginx:1.24.0-alpine"
   },
   {
-    "source": "library/nginx:1.23.3-alpine",
-    "dest": "library-mirror/nginx:1.23.3-alpine"
+    "source": "library/nginx:1.25.1-alpine",
+    "dest": "library-mirror/nginx:1.25.1-alpine"
   },
   {
     "source": "library/httpd:alpine",
@@ -238,7 +238,7 @@
     "source": "khs1994/tls"
   },
   {
-    "source": "khs1994/kube-nginx:1.23.3"
+    "source": "khs1994/kube-nginx:1.25.1"
   },
   {
     "source": "khs1994/kube-nginx"
@@ -253,7 +253,7 @@
     "source": "khs1994/nginx:alpine"
   },
   {
-    "source": "khs1994/nginx:1.23.3-alpine"
+    "source": "khs1994/nginx:1.25.1-alpine"
   },
   {
     "source": "khs1994/docker-image-sync:latest"

drone/.env.example

@@ -147,7 +147,7 @@ DRONE_UI_PASSWORD=root
 CI_DB_TYPE=
 
 CI_DRONE_VERSION=2.16.0
-CI_NGINX_VERSION=1.23.3
+CI_NGINX_VERSION=1.25.1
 CI_REDIS_VERSION=7.0.0
 CI_MYSQL_VERSION=8.0.33
 

drone/docker-ci.yml

@@ -89,8 +89,8 @@ services:
 
   nginx:
     << : *common
-    # image: khs1994/nginx:${CI_NGINX_VERSION:-1.23.3}-alpine
-    image: nginx:${CI_NGINX_VERSION:-1.23.3}-alpine
+    # image: khs1994/nginx:${CI_NGINX_VERSION:-1.25.1}-alpine
+    image: nginx:${CI_NGINX_VERSION:-1.25.1}-alpine
     networks:
       - frontend
     ports:

kubernetes/.env.example

@@ -19,7 +19,7 @@ HELM_VERSION=3.11.3
 CNI_VERSION=1.2.0
 # https://github.com/kubernetes-sigs/cri-tools/releases
 CRICTL_VERSION=1.27.0
-NGINX_VERSION=1.23.3
+NGINX_VERSION=1.25.1
 # https://github.com/containerd/containerd/releases
 CONTAINERD_VERSION=1.7.0
 # https://github.com/containers/conmon/releases

kubernetes/coreos/ignition/bu/kube-nginx.bu

@@ -18,8 +18,8 @@ systemd:
         # ExecStart=${K8S_ROOT}/kube-nginx/sbin/nginx -c ${K8S_ROOT}/kube-nginx/conf/kube-nginx.conf -p ${K8S_ROOT}/kube-nginx
         # ExecReload=${K8S_ROOT}/kube-nginx/sbin/nginx -c ${K8S_ROOT}/kube-nginx/conf/kube-nginx.conf -p ${K8S_ROOT}/kube-nginx -s reload
         ExecStartPre=-/bin/podman container rm kube-nginx
-        ExecStartPre=/bin/podman container run --rm $OPTIONS khs1994/kube-nginx:1.23.3 -t
-        ExecStart=/bin/podman container run --name kube-nginx $OPTIONS khs1994/kube-nginx:1.23.3
+        ExecStartPre=/bin/podman container run --rm $OPTIONS khs1994/kube-nginx:1.25.1 -t
+        ExecStart=/bin/podman container run --name kube-nginx $OPTIONS khs1994/kube-nginx:1.25.1
         ExecStop=/bin/podman container stop kube-nginx
         ExecStopPost=/bin/podman container rm kube-nginx
         PrivateTmp=true

kubernetes/coreos/server/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.23.3-alpine
+FROM nginx:1.25.1-alpine
 
 LABEL maintainer="[email protected]"
 

kubernetes/kube-nginx/Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.16
 
-ENV NGINX_VERSION=1.23.3
+ENV NGINX_VERSION=1.25.1
 
 RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \
     && apk add --no-cache --virtual .build_deps \

kubernetes/kube-nginx/docker-compose.yml

@@ -2,6 +2,6 @@
 
 services:
   kube-nginx:
-    image: khs1994/kube-nginx:1.23.3
+    image: khs1994/kube-nginx:1.25.1
     build:
       context: ./

kubernetes/lnmp/nginx/base/lnmp-nginx.yaml

@@ -33,8 +33,8 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
       - name: lnmp-nginx
-        # image: khs1994/nginx:1.23.3-alpine
-        image: "nginx:1.23.3-alpine"
+        # image: khs1994/nginx:1.25.1-alpine
+        image: "nginx:1.25.1-alpine"
         # image: ranadeeppolavarapu/nginx-http3
         imagePullPolicy: IfNotPresent
         args:

scripts/docker-compose.bump.yml

@@ -20,7 +20,7 @@ services:
     image: composer:2.5.8
 
   nginx:
-    image: nginx:1.23.3-alpine
+    image: nginx:1.25.1-alpine
 
   nginx-unit:
     image: docker.io/nginx/unit:1.30.0-minimal

windows/lnmp-windows-pm-repo/nginx/lwpm.json

@@ -8,7 +8,7 @@
   "path": [
     "C:\\nginx"
   ],
-  "pre-version": "1.23.3",
+  "pre-version": "1.25.1",
   "releases": "https://nginx.org/en/download.html",
   "scripts": {
     "install": "_cleanup nginx\n_unzip $filename nginx\n\n_mkdir C:\\nginx\n\nif(Test-Path C:\\nginx\\conf\\nginx.conf){\nCopy-Item C:\\nginx\\conf\\nginx.conf ~/Downloads/lnmp-docker-cache/nginx.conf.backup\n}\n\nCopy-item -r -force \"nginx\\nginx-${VERSION}\\*\" \"C:\\nginx\"\n\n_cleanup nginx\n\ncp $home/lnmp/windows/config/nginx.conf C:/nginx/conf\n",
@@ -28,5 +28,5 @@
   },
   "url": "https://nginx.org/download/nginx-${VERSION}.zip",
   "url-mirror": "https://repo.huaweicloud.com/nginx/nginx-${VERSION}.zip",
-  "version": "1.22.1"
+  "version": "1.24.0"
 }

windows/lnmp-windows-pm-repo/nginx/lwpm.yaml

@@ -1,7 +1,7 @@
 name: "nginx"
 description: "small, powerful, scalable web/proxy server"
-version: "1.22.1"
-pre-version: "1.23.3"
+version: "1.24.0"
+pre-version: "1.25.1"
 homepage: "https://nginx.org"
 bug: "http://nginx.org/en/support.html"
 github: "nginx/nginx"