Merge branch '20.10'

khs1994-docker · May 14, 2023 · d4e9a8d · d4e9a8d
2 parents 54c6277 + f3e6286
commit d4e9a8d
Show file tree

Hide file tree

Showing 412 changed files with 5,005 additions and 2,832 deletions.
diff --git a/.env.example b/.env.example
@@ -13,8 +13,9 @@ APP_ENV=development
 APP_ROOT=./app
 # APP_ROOT=../app
 
-# 项目存储在 WSL2, WSL2 中的路径，请同时在 .env.ps1 中设置 $WSL2_DIST
-# APP_ROOT=/app
+# 项目存储在 WSL2
+# 格式 APP_ROOT=\\wsl$\<your dist>\<wsl2 path>
+# APP_ROOT=\\wsl$\debian\app
 
 ################################################################################
 
@@ -123,25 +124,25 @@ TZ=Asia/Shanghai
 
 LNMP_NGINX_VERSION=1.23.3
 
-LNMP_MYSQL_VERSION=8.0.30
+LNMP_MYSQL_VERSION=8.0.33
 
-LNMP_PHP_VERSION=8.1.9
+LNMP_PHP_VERSION=8.2.3
 # LNMP_PHP_VERSION=nightly
 
 # EOL
 LNMP_PHP5_VERSION=5.6.37
 LNMP_PHP56_VERSION=5.6.37
-LNMP_PHP7_VERSION=7.4.32
+LNMP_PHP7_VERSION=7.4.33
 LNMP_PHP70_VERSION=7.0.33
 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_PHP74_VERSION=7.4.32
-LNMP_PHP8_VERSION=8.1.9
-LNMP_PHP80_VERSION=8.0.23
-LNMP_PHP81_VERSION=8.1.9
-LNMP_PHP82_VERSION=8.2.0
+LNMP_PHP8_VERSION=8.2.3
+LNMP_PHP80_VERSION=8.0.26
+LNMP_PHP81_VERSION=8.1.12
+LNMP_PHP82_VERSION=8.2.3
 
 LNMP_REDIS_VERSION=7.0.0
 

diff --git a/.env.example.ps1 b/.env.example.ps1
@@ -5,9 +5,9 @@ $CI_HOST="ci.khs1994.com:1218"
 # wsl name
 # $ wslconfig /l
 # $ wsl -l
-$DistributionName="Ubuntu-18.04"
+$DistributionName="Ubuntu-22.04"
 
-$LNMP_PHP_IMAGE="khs1994/php:8.1.9-composer-alpine"
+$LNMP_PHP_IMAGE="khs1994/php:8.2.3-composer-alpine"
 
 $NGINX_PATH="C:/nginx"
 $PHP_PATH="C:/php"
@@ -20,10 +20,6 @@ $LNMP_NODE_IMAGE="node:alpine"
 
 # $LNMP_CACHE=
 
-# 项目存储在 WSL2
-# 推荐使用 Ubuntu，其他系统（例如 alpine）可能会遇到错误
-# $WSL2_DIST="Ubuntu"
-
 # 挂载物理硬盘到 WSL2
 # $ wmic diskdrive list brief
 # $MountPhysicalDiskDeviceID2WSL2="\\.\PHYSICALDRIVE0"

diff --git a/.github/actions/setup-php/.github/workflows/ci.yaml b/.github/actions/setup-php/.github/workflows/ci.yaml
@@ -10,10 +10,11 @@ jobs:
       matrix:
         php_version:
           - nightly
-          - 8.1.9
-          - 8.0.23
-          - 7.4.32
+          - 8.2.3
+          - 8.1.12
+          - 8.0.26
           # EOL
+          - 7.4.33
           - 7.3.33
           - 7.2.34
           - 7.1.33

diff --git a/.github/actions/setup-php/action.yml b/.github/actions/setup-php/action.yml
@@ -6,7 +6,7 @@ author: 'khs1994'
 inputs:
   php_version:
     description: PHP version
-    default: "8.1.9"
+    default: "8.2.3"
     required: false
   php_type:
     description: php image type, fpm | composer | swoole | php-cs-fixer | doctum

diff --git a/.github/actions/setup-php/package.json b/.github/actions/setup-php/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {},
   "scripts": {
-    "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.1.9' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php"
+    "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.2.3' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php"
   },
   "author": "",
   "license": "ISC"

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -5,7 +5,7 @@ lnmp/app:
 
 lnmp/cli:
 - bin/**/*
-- cli/**/*
+- scripts/cli/**/*
 - lnmp-docker
 - lnmp-docker.ps1
 - lnmp-docker-custom-script.example
@@ -26,7 +26,7 @@ lnmp/core:
 - docker-lnmp.yml
 - docker-windows.yml
 - bin/**/*
-- cli/**/*
+- scripts/cli/**/*
 - lnmp-docker
 - lnmp-docker.ps1
 - lnmp-docker-custom-script.example

diff --git a/.github/workflows/check-link.yml b/.github/workflows/check-link.yml
@@ -28,7 +28,6 @@ jobs:
           "docker.domain.com","YourIP","register",\
           "https://www.freedesktop.org/wiki/Software/systemd/",\
           "cloud.tencent.com",\
-          "zan.khs1994.com",\
           "storage.khs1994.com",\
           "test2.t.khs1994.com",\
           "harbor.t.khs1994.com",\

diff --git a/.github/workflows/lwpm-dist-file.yaml b/.github/workflows/lwpm-dist-file.yaml
@@ -42,7 +42,7 @@ jobs:
         if: matrix.os == 'ubuntu' &&
             contains( github.event.head_commit.message, '[k8s]')
         env:
-          VERSION: 1.6.7
+          VERSION: 1.7.0
         run: |
           ./lnmp/windows/lnmp-windows-pm.ps1 dist containerd@${env:VERSION}
           ./lnmp/windows/lnmp-windows-pm.ps1 push containerd@${env:VERSION}
@@ -51,15 +51,15 @@ jobs:
         if: matrix.os == 'windows' &&
             contains( github.event.head_commit.message, '[k8s]')
         env:
-          VERSION: 1.26.0
+          VERSION: 1.27.0
         run: |
           ./lnmp/windows/lnmp-windows-pm.ps1 dist crictl@${env:VERSION}
           ./lnmp/windows/lnmp-windows-pm.ps1 push crictl@${env:VERSION}
       - name: handle-etcd
         if: endsWith('a', 'b')
         shell: pwsh
         env:
-          VERSION: 3.5.4
+          VERSION: 3.5.8
         run: |
           ./lnmp/windows/lnmp-windows-pm.ps1 dist etcd@${env:VERSION}
           ./lnmp/windows/lnmp-windows-pm.ps1 push etcd@${env:VERSION}

diff --git a/.github/workflows/lwpm-dist-k8s-file.yaml b/.github/workflows/lwpm-dist-k8s-file.yaml
@@ -6,7 +6,7 @@ on:
       LWPM_K8S_VERSION:
         description: k8s version
         required: true
-        default: 1.26.0
+        default: 1.27.0
 
 env:
   LWPM_K8S_VERSION: ${{ github.event.inputs.LWPM_K8S_VERSION }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -14,61 +14,61 @@ jobs:
       matrix:
         include:
           - JOB_NAME: wsl-php-builder-74
-            DIST_FILE: khs1994-wsl-php74_7.4.32-debian-bullseye_amd64.deb
+            DIST_FILE: khs1994-wsl-php74_7.4.33-debian-bullseye_amd64.deb
           - JOB_NAME: wsl-php-builder-80
-            DIST_FILE: khs1994-wsl-php80_8.0.23-debian-bullseye_amd64.deb
+            DIST_FILE: khs1994-wsl-php80_8.0.26-debian-bullseye_amd64.deb
           - JOB_NAME: wsl-php-builder-81
-            DIST_FILE: khs1994-wsl-php81_8.1.9-debian-bullseye_amd64.deb
+            DIST_FILE: khs1994-wsl-php81_8.1.12-debian-bullseye_amd64.deb
           - JOB_NAME: wsl-php-builder-nightly
             DIST_FILE: khs1994-wsl-php83_0.0.0-debian-bullseye_amd64.deb
           - JOB_NAME: wsl-php-builder-debian12-81
-            DIST_FILE: khs1994-wsl-php81_8.1.9-debian-bookworm_amd64.deb
+            DIST_FILE: khs1994-wsl-php81_8.1.12-debian-bookworm_amd64.deb
           - JOB_NAME: wsl-php-builder-ubuntu1804-74
-            DIST_FILE: khs1994-wsl-php74_7.4.32-ubuntu-bionic_amd64.deb
+            DIST_FILE: khs1994-wsl-php74_7.4.33-ubuntu-bionic_amd64.deb
           - JOB_NAME: wsl-php-builder-ubuntu1804-80
-            DIST_FILE: khs1994-wsl-php80_8.0.23-ubuntu-bionic_amd64.deb
+            DIST_FILE: khs1994-wsl-php80_8.0.26-ubuntu-bionic_amd64.deb
           - JOB_NAME: wsl-php-builder-ubuntu1804-81
-            DIST_FILE: khs1994-wsl-php81_8.1.9-ubuntu-bionic_amd64.deb
+            DIST_FILE: khs1994-wsl-php81_8.1.12-ubuntu-bionic_amd64.deb
           - JOB_NAME: wsl-php-builder-ubuntu2004-74
-            DIST_FILE: khs1994-wsl-php74_7.4.32-ubuntu-focal_amd64.deb
+            DIST_FILE: khs1994-wsl-php74_7.4.33-ubuntu-focal_amd64.deb
           - JOB_NAME: wsl-php-builder-ubuntu2004-80
-            DIST_FILE: khs1994-wsl-php80_8.0.23-ubuntu-focal_amd64.deb
+            DIST_FILE: khs1994-wsl-php80_8.0.26-ubuntu-focal_amd64.deb
           - JOB_NAME: wsl-php-builder-ubuntu2004-81
-            DIST_FILE: khs1994-wsl-php81_8.1.9-ubuntu-focal_amd64.deb
+            DIST_FILE: khs1994-wsl-php81_8.1.12-ubuntu-focal_amd64.deb
           - JOB_NAME: wsl-php-builder-ubuntu2204-74
-            DIST_FILE: khs1994-wsl-php74_7.4.32-ubuntu-jammy_amd64.deb
+            DIST_FILE: khs1994-wsl-php74_7.4.33-ubuntu-jammy_amd64.deb
           - JOB_NAME: wsl-php-builder-ubuntu2204-80
-            DIST_FILE: khs1994-wsl-php80_8.0.23-ubuntu-jammy_amd64.deb
+            DIST_FILE: khs1994-wsl-php80_8.0.26-ubuntu-jammy_amd64.deb
           - JOB_NAME: wsl-php-builder-ubuntu2204-81
-            DIST_FILE: khs1994-wsl-php81_8.1.9-ubuntu-jammy_amd64.deb
+            DIST_FILE: khs1994-wsl-php81_8.1.12-ubuntu-jammy_amd64.deb
           - JOB_NAME: wsl-php-builder-ubuntu2204-nightly
             DIST_FILE: khs1994-wsl-php83_0.0.0-ubuntu-jammy_amd64.deb
           - JOB_NAME: wsl-php-builder-ubuntu2210-81
-            DIST_FILE: khs1994-wsl-php81_8.1.9-ubuntu-kinetic_amd64.deb
+            DIST_FILE: khs1994-wsl-php81_8.1.12-ubuntu-kinetic_amd64.deb
           - JOB_NAME: wsl-php-builder-rhel7-74
-            DIST_FILE: khs1994-wsl-php74-7.4.32-1.el7.centos.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php74-7.4.33-1.el7.centos.x86_64.rpm
           - JOB_NAME: wsl-php-builder-rhel8-74
-            DIST_FILE: khs1994-wsl-php74-7.4.32-1.el8.centos.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php74-7.4.33-1.el8.centos.x86_64.rpm
           - JOB_NAME: wsl-php-builder-rhel8-80
-            DIST_FILE: khs1994-wsl-php80-8.0.23-1.el8.centos.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php80-8.0.26-1.el8.centos.x86_64.rpm
           - JOB_NAME: wsl-php-builder-rhel8-81
-            DIST_FILE: khs1994-wsl-php81-8.1.9-1.el8.centos.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php81-8.1.12-1.el8.centos.x86_64.rpm
           - JOB_NAME: wsl-php-builder-rhel9-74
-            DIST_FILE: khs1994-wsl-php74-7.4.32-1.el9.centos.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php74-7.4.33-1.el9.centos.x86_64.rpm
           - JOB_NAME: wsl-php-builder-rhel9-80
-            DIST_FILE: khs1994-wsl-php80-8.0.23-1.el9.centos.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php80-8.0.26-1.el9.centos.x86_64.rpm
           - JOB_NAME: wsl-php-builder-rhel9-81
-            DIST_FILE: khs1994-wsl-php81-8.1.9-1.el9.centos.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php81-8.1.12-1.el9.centos.x86_64.rpm
           - JOB_NAME: wsl-php-builder-rocky8-81
-            DIST_FILE: khs1994-wsl-php81-8.1.9-1.el8.rocky.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php81-8.1.12-1.el8.rocky.x86_64.rpm
           - JOB_NAME: wsl-php-builder-rocky9-81
-            DIST_FILE: khs1994-wsl-php81-8.1.9-1.el9.rocky.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php81-8.1.12-1.el9.rocky.x86_64.rpm
           - JOB_NAME: wsl-php-builder-fc36-74
-            DIST_FILE: khs1994-wsl-php74-7.4.32-1.fc36.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php74-7.4.33-1.fc36.x86_64.rpm
           - JOB_NAME: wsl-php-builder-fc36-80
-            DIST_FILE: khs1994-wsl-php80-8.0.23-1.fc36.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php80-8.0.26-1.fc36.x86_64.rpm
           - JOB_NAME: wsl-php-builder-fc36-81
-            DIST_FILE: khs1994-wsl-php81-8.1.9-1.fc36.x86_64.rpm
+            DIST_FILE: khs1994-wsl-php81-8.1.12-1.fc36.x86_64.rpm
           - JOB_NAME: wsl-php-builder-fc36-nightly
             DIST_FILE: khs1994-wsl-php83-0.0.0-1.fc36.x86_64.rpm
           - JOB_NAME: wsl-php-builder-fc37-nightly
@@ -96,19 +96,19 @@ jobs:
         gh release create $GITHUB_TAG -F CHANGELOG.md --target 20.10 -t $GITHUB_TAG || true
 
         # deb
-        sh cli/build.sh deb ${GITHUB_TAG}
+        sh scripts/cli/build.sh deb ${GITHUB_TAG}
         export VERSION=$( echo ${GITHUB_TAG} | cut -d "v" -f 2 )
         export DEB_NAME=khs1994-docker-lnmp_${VERSION}_amd64.deb
-        ls -la cli
-        sudo dpkg -i cli/${DEB_NAME}
-        gh release upload ${GITHUB_TAG} cli/${DEB_NAME} --repo khs1994-docker/lnmp --clobber
+        ls -la scripts/cli
+        sudo dpkg -i scripts/cli/${DEB_NAME}
+        gh release upload ${GITHUB_TAG} scripts/cli/${DEB_NAME} --repo khs1994-docker/lnmp --clobber
 
         # rpm
         test $( echo "${GITHUB_TAG}" | grep alpha ) && exit 0 || true
         test $( echo "${GITHUB_TAG}" | grep beta ) && exit 0 || true
         test $( echo "${GITHUB_TAG}" | grep rc ) && exit 0 || true
         sudo apt install -y rpm
-        sh cli/build.sh rpm ${GITHUB_TAG}
+        sh scripts/cli/build.sh rpm ${GITHUB_TAG}
         export VERSION=$( echo ${GITHUB_TAG} | cut -d "v" -f 2 )
         export RPM_NAME=$( cd $HOME; ls *.rpm )
         ls -la ~/*.rpm

diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,8 @@ docker-compose-Linux-x86_64
 /docker-workspace.yml
 /compose.yml
 /compose.yaml
+/compose-up.yaml
+/compose-up.yml
 
 # cache
 

diff --git a/.pcit.yml b/.pcit.yml
@@ -4,7 +4,7 @@ workspace:
 
 steps:
   bash:
-    image: khs1994/php:8.1.9-composer-alpine
+    image: khs1994/php:8.2.3-composer-alpine
     run:
       - pwd
       - bash ./lnmp-docker

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -13,7 +13,7 @@
       "ms-vscode-remote.remote-wsl",
       "ms-vscode-remote.remote-containers",
       // "ms-vscode-remote.remote-ssh",
-      "ms-vscode.powershell-preview",
+      "ms-vscode.powershell",
       "editorconfig.editorconfig",
       "ivory-lab.jenkinsfile-support",
       // "ms-python.vscode-pylance",

diff --git a/README.cn.md b/README.cn.md
@@ -57,9 +57,9 @@
 
 :one: [Git](https://mirrors.huaweicloud.com/git-for-windows/)
 
-:two: [Docker CE](https://github.com/yeasy/docker_practice/tree/master/install) 19.03 Stable +
+:two: [Docker](https://github.com/yeasy/docker_practice/tree/master/install) 20.10 Stable +
 
-:three: [Docker Compose V2](https://github.com/yeasy/docker_practice/blob/master/compose/install.md)
+:three: [Docker Compose v2.17.0+](https://github.com/yeasy/docker_practice/blob/master/compose/install.md)
 
 :four: WSL (**Windows** Only)
 
@@ -202,13 +202,13 @@ $ ./lnmp-docker down
 |:-- |:--         |:--    |:--  |
 |[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 Unit](https://github.com/nginx/unit)                               |`khs1994/php:8.1.9-unit-alpine`| **1.28.0**          |`alpine:3.16`    |
+|[NGINX Unit](https://github.com/nginx/unit)                               |`khs1994/php:8.2.3-unit-alpine`| **1.28.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.30`                  | **8.0.30**          |`oraclelinux:8-slim`|
+|[MySQL](https://github.com/docker-library/docs/tree/master/mysql)         |`mysql:8.0.33`                  | **8.0.33**          |`oraclelinux:8-slim`|
 |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb)     |`mariadb:10.8.3`                | **10.8.3**          |`ubuntu:jammy`  |
 |[Redis](https://github.com/docker-library/docs/tree/master/redis)         |`redis:7.0.0-alpine`            | **7.0.0**           |`alpine:3.16`    |
-|[PHP-FPM](https://github.com/khs1994-docker/php)                          |`khs1994/php:8.1.9-fpm-alpine`     | **8.1.9**      |`alpine:3.16`    |
-|[Composer](https://github.com/docker-library/docs/tree/master/composer)   |`khs1994/php:8.1.9-composer-alpine`| **2.5.1**     |`alpine:3.16`    |
+|[PHP-FPM](https://github.com/khs1994-docker/php)                          |`khs1994/php:8.2.3-fpm-alpine`     | **8.2.3**      |`alpine:3.16`    |
+|[Composer](https://github.com/docker-library/docs/tree/master/composer)   |`khs1994/php:8.2.3-composer-alpine`| **2.5.5**     |`alpine:3.16`    |
 |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine`           | **1.6.15**       |`alpine:3.16`    |
 |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq)   |`rabbitmq:3.9.0-management-alpine` | **3.9.0**       |`alpine:3.13`    |
 |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine`             | **14.0**        |`alpine:3.14`    |

diff --git a/README.md b/README.md
@@ -55,9 +55,9 @@ To use LNMP Docker, you need:
 
 :one: [Git](https://git-scm.com/downloads)
 
-:two: [Docker CE](https://github.com/yeasy/docker_practice/tree/master/install) 19.03 Stable +
+:two: [Docker](https://github.com/yeasy/docker_practice/tree/master/install) 20.10 Stable +
 
-:three: [Docker Compose V2](https://github.com/yeasy/docker_practice/blob/master/compose/install.md)
+:three: [Docker Compose v2.17.0+](https://github.com/yeasy/docker_practice/blob/master/compose/install.md)
 
 :four: WSL (**Windows** Only)
 
@@ -197,13 +197,13 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#%
 |:-- |:--         |:--    |:--  |
 |[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 Unit](https://github.com/nginx/unit)                               |`khs1994/php:8.1.9-unit-alpine`| **1.28.0**          |`alpine:3.16`    |
+|[NGINX Unit](https://github.com/nginx/unit)                               |`khs1994/php:8.2.3-unit-alpine`| **1.28.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.30`                  | **8.0.30**          |`oraclelinux:8-slim`|
+|[MySQL](https://github.com/docker-library/docs/tree/master/mysql)         |`mysql:8.0.33`                  | **8.0.33**          |`oraclelinux:8-slim`|
 |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb)     |`mariadb:10.8.3`                | **10.8.3**          |`ubuntu:jammy`  |
 |[Redis](https://github.com/docker-library/docs/tree/master/redis)         |`redis:7.0.0-alpine`            | **7.0.0**           |`alpine:3.16`    |
-|[PHP-FPM](https://github.com/khs1994-docker/php)                          |`khs1994/php:8.1.9-fpm-alpine`     | **8.1.9**       |`alpine:3.16`    |
-|[Composer](https://github.com/docker-library/docs/tree/master/composer)   |`khs1994/php:8.1.9-composer-alpine`| **2.5.1**      |`alpine:3.16`    |
+|[PHP-FPM](https://github.com/khs1994-docker/php)                          |`khs1994/php:8.2.3-fpm-alpine`     | **8.2.3**       |`alpine:3.16`    |
+|[Composer](https://github.com/docker-library/docs/tree/master/composer)   |`khs1994/php:8.2.3-composer-alpine`| **2.5.5**      |`alpine:3.16`    |
 |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine`           | **1.6.15**       |`alpine:3.16`    |
 |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq)   |`rabbitmq:3.9.0-management-alpine` | **3.9.0**       |`alpine:3.13`    |
 |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine`             | **14.0**        |`alpine:3.14`    |

diff --git a/RELEASE.md b/RELEASE.md
diff --git a/TODO.md b/TODO.md
@@ -1,4 +1,4 @@
 # TODO
 
 * `lnmp-docker` 代码控制在 `1700` 行以内
-* `lnmp-docker.ps1` 代码控制在 `1400` 行以内
+* `lnmp-docker.ps1` 代码控制在 `1300` 行以内
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,10 +10,11 @@ jobs: @@
           matrix:
             php_version:
               - nightly
-              - 8.1.9
-              - 8.0.23
-              - 7.4.32
+              - 8.2.3
+              - 8.1.12
+              - 8.0.26
               # EOL
+              - 7.4.33
               - 7.3.33
               - 7.2.34
               - 7.1.33
@@ Expand Down @@