Merge branch '23.11'

.appveyor.yml

@@ -6,7 +6,6 @@ branches:
   # - windows
   - /^master$/
   - master
-  - "20.10"
   # - /v*/
 
 # skip_non_tags: true

.env.example

@@ -1,3 +1,13 @@
+# 本项目全局变量
+
+# 是否为国内环境，默认为 true，当处于非国内环境(例如：GitHub Actions)时请改为 false
+LNMP_CN_ENV=true # true or false
+
+
+
+# end
+
+
 # https://docs.docker.com/compose/reference/envvars/
 
 # [compose]
@@ -45,10 +55,6 @@ LREW_INCLUDE="minio"
 
 ################################################################################
 
-# privacy info, please set true to help us improve
-
-DATA_COLLECTION=true
-
 # [PCIT]
 LNMP_PCIT_PORT=10000
 
@@ -102,8 +108,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]
 
@@ -122,14 +128,16 @@ TZ=Asia/Shanghai
 
 # [Version]
 
-LNMP_NGINX_VERSION=1.23.3
+# https://nginx.org/en/CHANGES
+LNMP_NGINX_VERSION=1.25.3
 
 LNMP_MYSQL_VERSION=8.0.33
 
-LNMP_PHP_VERSION=8.2.3
+# latest php version
+LNMP_PHP_VERSION=8.3.0
 # LNMP_PHP_VERSION=nightly
 
-# EOL
+# PHP EOL VERSION
 LNMP_PHP5_VERSION=5.6.37
 LNMP_PHP56_VERSION=5.6.37
 LNMP_PHP7_VERSION=7.4.33
@@ -138,19 +146,22 @@ LNMP_PHP71_VERSION=7.1.33
 LNMP_PHP72_VERSION=7.2.34
 LNMP_PHP73_VERSION=7.3.33
 LNMP_PHP74_VERSION=7.4.33
-# EOL
-LNMP_PHP8_VERSION=8.2.3
-LNMP_PHP80_VERSION=8.0.26
-LNMP_PHP81_VERSION=8.1.12
-LNMP_PHP82_VERSION=8.2.3
+# PHP EOL VERSION END
+
+# latest php version
+LNMP_PHP8_VERSION=8.3.0
+LNMP_PHP80_VERSION=8.0.30
+LNMP_PHP81_VERSION=8.1.26
+LNMP_PHP82_VERSION=8.2.13
+LNMP_PHP83_VERSION=8.3.0
 
 LNMP_REDIS_VERSION=7.0.0
 
 LNMP_MEMCACHED_VERSION=1.6.15
 
 LNMP_PHPMYADMIN_VERSION=5.2.0
 
-LNMP_NODE_VERSION=18.2.0
+LNMP_NODE_VERSION=20.5.1
 
 # [CONF FILE NAME]
 #
@@ -172,7 +183,6 @@ LNMP_NODE_VERSION=18.2.0
 
 LNMP_DOCKER_IMAGE_PREFIX=khs1994
 # LNMP_DOCKER_IMAGE_PREFIX=lrew
-# LNMP_DOCKER_IMAGE_PREFIX=ccr.ccs.tencentyun.com/khs1994
 # LNMP_DOCKER_IMAGE_PREFIX=ccr.ccs.tencentyun.com/your-company
 # LNMP_DOCKER_IMAGE_PREFIX=pcit-docker.pkg.coding.net/khs1994-docker/khs1994
 
@@ -182,6 +192,7 @@ LNMP_LIBRARY_NS=library
 # LNMP_LIBRARY_NS=library-mirror
 # LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror
 # LNMP_LIBRARY_NS=pcit-docker.pkg.coding.net/khs1994-docker/library
+# LNMP_LIBRARY_NS=hub.atomgit.com
 
 ## [PHP 项目文件路径（容器内路径）（绝对路径）]
 
@@ -243,4 +254,4 @@ LNMP_RESTART=always
 # 不过当daemon启动时，如果容器之前已经为停止状态，不要尝试启动它
 ########################## Don't Edit #############################
 
-LNMP_DOCKER_VERSION=
+LNMP_VERSION=

.env.example.ps1

@@ -1,3 +1,12 @@
+# 本项目全局变量
+
+# 是否为国内环境，默认为 true，当处于非国内环境(例如：GitHub Actions)时请改为 false
+${env:LNMP_CN_ENV}=$true # true or false
+
+
+
+# end
+
 # You can overwrite this file in .env.ps1
 
 $CI_HOST="ci.khs1994.com:1218"
@@ -7,7 +16,8 @@ $CI_HOST="ci.khs1994.com:1218"
 # $ wsl -l
 $DistributionName="Ubuntu-22.04"
 
-$LNMP_PHP_IMAGE="khs1994/php:8.2.3-composer-alpine"
+# latest php version
+$LNMP_PHP_IMAGE="khs1994/php:8.3.0-composer-alpine"
 
 $NGINX_PATH="C:/nginx"
 $PHP_PATH="C:/php"

.github/actions/setup-docker/.github/workflows/ci.yaml

@@ -17,9 +17,11 @@ jobs:
       fail-fast: false
       matrix:
         docker_version:
-          - 18.09
-          - 19.03
+          # - 18.09
+          # - 19.03
           - "20.10"
+          - "23.0"
+          - "24.0"
         docker_channel:
           - stable
           - test
@@ -28,7 +30,8 @@ jobs:
           - ubuntu-20.04
           - ubuntu-22.04
           - ubuntu-latest
-          - macos-12
+          - macos-13
+          # - macos-13-xlarge
         include:
           # macOS
           - os: macos-latest
@@ -135,37 +138,36 @@ jobs:
           # channel: ${{ matrix.docker_channel }}
           push_image: ${{ github.event_name == 'push' }}
 
-  docker-nightly:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-18.04
-          - ubuntu-20.04
-          - ubuntu-22.04
-          - ubuntu-latest
-    runs-on: ${{ matrix.os }}
-    defaults:
-      run:
-        shell: bash --noprofile --norc -exo pipefail {0}
-    steps:
-      - uses: actions/checkout@main
-        with:
-          fetch-depth: 2
-      - uses: azure/docker-login@v1
-        if: |
-          github.event_name == 'push'
-        with:
-          # login-server: contoso.azurecr.io
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: setup docker
-        uses: ./
-        # uses: docker-practice/actions-setup-docker@master
-        with:
-          docker_nightly_version: snapshot-20210202
-          docker_channel: nightly
-      - run: docker version
+  # docker-nightly:
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       os:
+  #         - ubuntu-20.04
+  #         - ubuntu-22.04
+  #         - ubuntu-latest
+  #   runs-on: ${{ matrix.os }}
+  #   defaults:
+  #     run:
+  #       shell: bash --noprofile --norc -exo pipefail {0}
+  #   steps:
+  #     - uses: actions/checkout@main
+  #       with:
+  #         fetch-depth: 2
+  #     - uses: azure/docker-login@v1
+  #       if: |
+  #         github.event_name == 'push'
+  #       with:
+  #         # login-server: contoso.azurecr.io
+  #         username: ${{ secrets.DOCKER_USERNAME }}
+  #         password: ${{ secrets.DOCKER_PASSWORD }}
+  #     - name: setup docker
+  #       uses: ./
+  #       # uses: docker-practice/actions-setup-docker@master
+  #       with:
+  #         docker_nightly_version: snapshot-20210202
+  #         docker_channel: nightly
+  #     - run: docker version
 
   notsupport-platform:
     strategy:

.github/actions/setup-docker/action.yml

@@ -6,7 +6,7 @@ author: 'khs1994'
 inputs:
   docker_version:
     description: Docker Version
-    default: "20.10"
+    default: "24.0"
     required: false
   docker_nightly_version:
     # https://github.com/AkihiroSuda/moby-snapshot/releases