diff --git a/.appveyor.yml b/.appveyor.yml index f4e2a211b..fe34f92cc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,9 +4,9 @@ image: Visual Studio 2019 branches: only: # - windows - # - /^20.10$/ + # - /^23.11$/ - master - - "20.10" + - "23.11" # - /v*/ # skip_non_tags: true diff --git a/.env.example b/.env.example index 30100c20e..20e354413 100644 --- a/.env.example +++ b/.env.example @@ -123,7 +123,8 @@ LNMP_NGINX_VERSION=1.25.3 LNMP_MYSQL_VERSION=8.0.33 -LNMP_PHP_VERSION=8.2.13 +# latest php version +LNMP_PHP_VERSION=8.3.0 # LNMP_PHP_VERSION=nightly # PHP EOL VERSION @@ -137,7 +138,8 @@ LNMP_PHP73_VERSION=7.3.33 LNMP_PHP74_VERSION=7.4.33 # PHP EOL VERSION END -LNMP_PHP8_VERSION=8.2.13 +# 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 diff --git a/.env.example.ps1 b/.env.example.ps1 index e001b666d..1e4f2f529 100644 --- a/.env.example.ps1 +++ b/.env.example.ps1 @@ -7,7 +7,8 @@ $CI_HOST="ci.khs1994.com:1218" # $ wsl -l $DistributionName="Ubuntu-22.04" -$LNMP_PHP_IMAGE="khs1994/php:8.2.13-composer-alpine" +# latest php version +$LNMP_PHP_IMAGE="khs1994/php:8.3.0-composer-alpine" $NGINX_PATH="C:/nginx" $PHP_PATH="C:/php" diff --git a/.github/actions/setup-lnmp/.github/workflows/ci.yaml b/.github/actions/setup-lnmp/.github/workflows/ci.yaml index 083ed2210..636fc6125 100644 --- a/.github/actions/setup-lnmp/.github/workflows/ci.yaml +++ b/.github/actions/setup-lnmp/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ jobs: matrix: lnmp_branch: - 19.03 - - "20.10" + - "23.11" - master runs-on: ubuntu-latest steps: diff --git a/.github/actions/setup-lnmp/action.yml b/.github/actions/setup-lnmp/action.yml index 9e48bbe2d..41a09e3b4 100644 --- a/.github/actions/setup-lnmp/action.yml +++ b/.github/actions/setup-lnmp/action.yml @@ -6,7 +6,7 @@ author: 'khs1994' inputs: lnmp_branch: description: lnmp branch - default: "20.10" + default: "23.11" required: false lnmp_services: description: lnmp services diff --git a/.github/actions/setup-php/.github/workflows/ci.yaml b/.github/actions/setup-php/.github/workflows/ci.yaml index 549794e25..35a69f697 100644 --- a/.github/actions/setup-php/.github/workflows/ci.yaml +++ b/.github/actions/setup-php/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ jobs: matrix: php_version: - nightly - - 8.2.13 + - 8.3.0 - 8.1.26 - 8.0.30 # EOL diff --git a/.github/actions/setup-php/action.yml b/.github/actions/setup-php/action.yml index f8682ad7c..47b3e360a 100644 --- 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.2.13" + default: "8.3.0" 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 index 54c658aec..3f6757866 100644 --- 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.2.13' 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.3.0' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" }, "author": "", "license": "ISC" diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index eb301c784..ac028b0f4 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -10,7 +10,7 @@ on: tags: - '*' branches: - - "20.10" + - "23.11" workflow_dispatch: name: Build Docs diff --git a/.github/workflows/lwpm-dist-file.yaml b/.github/workflows/lwpm-dist-file.yaml index 6f428617c..bddf889d2 100644 --- a/.github/workflows/lwpm-dist-file.yaml +++ b/.github/workflows/lwpm-dist-file.yaml @@ -3,7 +3,7 @@ name: LWPM Dist File on: push: branches: - - "20.10" + - "23.11" workflow_dispatch: jobs: @@ -26,7 +26,7 @@ jobs: with: repository: khs1994-docker/lnmp fetch-depth: 1 - # ref: "20.10" + # ref: "23.11" path: lnmp - name: handle-conmon shell: pwsh diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b5dfbcfae..a5184cec2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,7 +1,7 @@ on: push: tags: - - v20.10.* + - v23.11.* workflow_dispatch: name: Release @@ -93,7 +93,7 @@ jobs: fi export GITHUB_TAG=$(echo $GITHUB_REF | cut -d '/' -f 3) - gh release create $GITHUB_TAG -F CHANGELOG.md --target 20.10 -t $GITHUB_TAG || true + gh release create $GITHUB_TAG -F CHANGELOG.md --target 23.11 -t $GITHUB_TAG || true # deb sh scripts/cli/build.sh deb ${GITHUB_TAG} diff --git a/.github/workflows/sync-actions.yml b/.github/workflows/sync-actions.yml index 907563e8f..c003e2a7a 100644 --- a/.github/workflows/sync-actions.yml +++ b/.github/workflows/sync-actions.yml @@ -3,7 +3,7 @@ on: tags: - '*' branches: - - "20.10" + - "23.11" # paths: # - '/.github/actions/*' workflow_dispatch: diff --git a/.github/workflows/sync-git.yml b/.github/workflows/sync-git.yml index 1d4e438cf..0394aea01 100644 --- a/.github/workflows/sync-git.yml +++ b/.github/workflows/sync-git.yml @@ -5,7 +5,7 @@ on: tags: - '*' branches: - - "20.10" + - "23.11" workflow_dispatch: name: Sync Git diff --git a/.github/workflows/sync-php.yml b/.github/workflows/sync-php.yml index 39f0c7058..8759fdf68 100644 --- a/.github/workflows/sync-php.yml +++ b/.github/workflows/sync-php.yml @@ -5,7 +5,7 @@ on: # - '*' # Sequence of patterns matched against refs/heads branches: - - 20.10-pre + - 23.11-pre # - 'releases/*' # Push events to branches matching refs/heads/releases/* workflow_dispatch: @@ -15,7 +15,7 @@ jobs: sync-php: runs-on: ubuntu-latest if: | - github.ref == 'refs/heads/20.10-pre' + github.ref == 'refs/heads/23.11-pre' steps: - uses: actions/checkout@main with: diff --git a/.pcit.yml b/.pcit.yml index 9f3052b18..9bd51ec58 100644 --- a/.pcit.yml +++ b/.pcit.yml @@ -4,7 +4,8 @@ workspace: steps: bash: - image: khs1994/php:8.2.13-composer-alpine + # latest php version + image: khs1994/php:8.3.0-composer-alpine run: - pwd - bash ./lnmp-docker @@ -18,4 +19,4 @@ steps: branches: - master -- "20.10" +- "23.11" diff --git a/CHANGELOG.md b/CHANGELOG.md index f617b32c4..b2cf0d39b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Changelog -## v20.10.30 +## v23.11.0 ### Compare -* https://github.com/khs1994-docker/lnmp/compare/v20.10.29...20.10 +* https://github.com/khs1994-docker/lnmp/compare/v20.10.30...23.11 ### Bug fixes: @@ -12,4 +12,4 @@ ### Updates: -* [PHP `8.2.13` `8.1.26` `8.0.30`](https://www.php.net/ChangeLog-8.php#8.1.26) +* [PHP `8.3.0` `8.2.13` `8.1.26`](https://www.php.net/ChangeLog-8.php#8.1.26) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dac265286..ba53a4b2c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ * 在 [GitHub](https://github.com/khs1994-docker/lnmp/fork) 上点击 `fork` 按钮将本仓库 fork 到自己的仓库，如 `yourname/lnmp`，然后 `clone` 到本地。 ```bash - $ git clone -b 20.10 git@github.com:yourname/lnmp.git + $ git clone -b 23.11 git@github.com:yourname/lnmp.git $ cd lnmp @@ -21,17 +21,17 @@ $ git commit -a "Fix issue #1: change helo to hello" - $ git push origin 20.10 + $ git push origin 23.11 ``` -* 在 [GitHub](https://github.com/khs1994-docker/lnmp) 上提交 `Pull request`，注意请提交到 YY.MM(例如: `20.10`) 分支。 +* 在 [GitHub](https://github.com/khs1994-docker/lnmp) 上提交 `Pull request`，注意请提交到 YY.MM(例如: `23.11`) 分支。 * 请定期更新自己仓库。 ```bash $ git fetch upstream - $ git rebase upstream/20.10 + $ git rebase upstream/23.11 - $ git push -f origin 20.10 + $ git push -f origin 23.11 ``` diff --git a/README.cn.md b/README.cn.md index 5fa1b4138..d5edd94d1 100644 --- a/README.cn.md +++ b/README.cn.md @@ -9,7 +9,7 @@ LNMP_DOCKER_IMAGE_PREFIX=pcit-docker.pkg.coding.net/khs1994-docker/khs1994 LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror ``` -[![GitHub stars](https://img.shields.io/github/stars/khs1994-docker/lnmp.svg?style=social&label=Stars)](https://github.com/khs1994-docker/lnmp) [![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)](https://github.com/khs1994-docker/lnmp/releases) [![license](https://img.shields.io/github/license/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp) [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) +[![GitHub stars](https://img.shields.io/github/stars/khs1994-docker/lnmp.svg?style=social&label=Stars)](https://github.com/khs1994-docker/lnmp) [![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)](https://github.com/khs1994-docker/lnmp/releases) [![license](https://img.shields.io/github/license/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp) [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=23.11)](https://ci.khs1994.com/github/khs1994-docker/lnmp) [![star](https://gitee.com/khs1994-docker/lnmp/badge/star.svg?theme=dark)](https://gitee.com/khs1994-docker/lnmp/stargazers) @@ -19,9 +19,9 @@ LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror | Platform | Status | | -- | -- | -| Windows | [![Build status](https://ci.appveyor.com/api/projects/status/itgp61n808n80b8m/branch/20.10?svg=true)](https://ci.appveyor.com/project/khs1994-docker/lnmp/branch/20.10) | -| Linux | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) | -| macOS | ![CI](https://github.com/khs1994-docker/lnmp/workflows/CI/badge.svg?branch=20.10) | +| Windows | [![Build status](https://ci.appveyor.com/api/projects/status/itgp61n808n80b8m/branch/23.11?svg=true)](https://ci.appveyor.com/project/khs1994-docker/lnmp/branch/23.11) | +| Linux | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=23.11)](https://ci.khs1994.com/github/khs1994-docker/lnmp) | +| macOS | ![CI](https://github.com/khs1994-docker/lnmp/workflows/CI/badge.svg?branch=23.11) | | Linux arm64v8 | - |

@@ -66,7 +66,7 @@ LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror :one: [Git](https://mirrors.huaweicloud.com/git-for-windows/) -:two: [Docker](https://github.com/yeasy/docker_practice/tree/master/install) 20.10 Stable + +:two: [Docker](https://github.com/yeasy/docker_practice/tree/master/install) 23.11 Stable + :three: [Docker Compose v2.17.0+](https://github.com/yeasy/docker_practice/blob/master/compose/install.md) @@ -103,7 +103,7 @@ $ ./lnmp-docker up $ curl 127.0.0.1 -Welcome use khs1994-docker/lnmp v20.10 x86_64 With Pull Docker Image +Welcome use khs1994-docker/lnmp v23.11 x86_64 With Pull Docker Image development @@ -211,13 +211,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.25.3-alpine` | **1.25.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.13-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.3.0-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`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.5` | **10.11.5** |`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.2.13-fpm-alpine` | **8.2.13** |`alpine:3.19` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.13-composer-alpine`| **2.5.8** |`alpine:3.19` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.3.0-fpm-alpine` | **8.3.0** |`alpine:3.19` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.3.0-composer-alpine`| **2.5.8** |`alpine:3.19` | |[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 index 95d097fe2..42aaad91d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ LNMP_DOCKER_IMAGE_PREFIX=pcit-docker.pkg.coding.net/khs1994-docker/khs1994 LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror ``` -[![GitHub stars](https://img.shields.io/github/stars/khs1994-docker/lnmp.svg?style=social&label=Stars)](https://github.com/khs1994-docker/lnmp) [![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)](https://github.com/khs1994-docker/lnmp/releases) [![license](https://img.shields.io/github/license/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp) [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) +[![GitHub stars](https://img.shields.io/github/stars/khs1994-docker/lnmp.svg?style=social&label=Stars)](https://github.com/khs1994-docker/lnmp) [![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)](https://github.com/khs1994-docker/lnmp/releases) [![license](https://img.shields.io/github/license/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp) [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=23.11)](https://ci.khs1994.com/github/khs1994-docker/lnmp) [![star](https://gitee.com/khs1994-docker/lnmp/badge/star.svg?theme=dark)](https://gitee.com/khs1994-docker/lnmp/stargazers) @@ -17,10 +17,10 @@ LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror | Platform | Status | | -- | -- | -| Windows | [![Build status](https://ci.appveyor.com/api/projects/status/itgp61n808n80b8m/branch/20.10?svg=true)](https://ci.appveyor.com/project/khs1994-docker/lnmp/branch/20.10) | -| Linux | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) | -| macOS | ![CI](https://github.com/khs1994-docker/lnmp/workflows/CI/badge.svg?branch=20.10) | -| Linux arm64v8 | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) | +| Windows | [![Build status](https://ci.appveyor.com/api/projects/status/itgp61n808n80b8m/branch/23.11?svg=true)](https://ci.appveyor.com/project/khs1994-docker/lnmp/branch/23.11) | +| Linux | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=23.11)](https://ci.khs1994.com/github/khs1994-docker/lnmp) | +| macOS | ![CI](https://github.com/khs1994-docker/lnmp/workflows/CI/badge.svg?branch=23.11) | +| Linux arm64v8 | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=23.11)](https://ci.khs1994.com/github/khs1994-docker/lnmp) |

@@ -64,7 +64,7 @@ To use LNMP Docker, you need: :one: [Git](https://git-scm.com/downloads) -:two: [Docker](https://github.com/yeasy/docker_practice/tree/master/install) 20.10 Stable + +:two: [Docker](https://github.com/yeasy/docker_practice/tree/master/install) 23.11 Stable + :three: [Docker Compose v2.17.0+](https://github.com/yeasy/docker_practice/blob/master/compose/install.md) @@ -101,7 +101,7 @@ $ ./lnmp-docker up $ curl 127.0.0.1 -Welcome use khs1994-docker/lnmp v20.10 x86_64 With Pull Docker Image +Welcome use khs1994-docker/lnmp v23.11 x86_64 With Pull Docker Image development @@ -206,13 +206,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.25.3-alpine` | **1.25.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.13-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.3.0-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`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.5` | **10.11.5** |`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.2.13-fpm-alpine` | **8.2.13** |`alpine:3.19` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.13-composer-alpine`| **2.5.8** |`alpine:3.19` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.3.0-fpm-alpine` | **8.3.0** |`alpine:3.19` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.3.0-composer-alpine`| **2.5.8** |`alpine:3.19` | |[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/app/demo/.drone.yml b/app/demo/.drone.yml index 57e34c629..4bbc0e4d4 100644 --- a/app/demo/.drone.yml +++ b/app/demo/.drone.yml @@ -34,7 +34,7 @@ steps: # install dep - name: install # image: composer:2.5.8 - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine commands: - pwd - composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/ @@ -46,7 +46,7 @@ steps: # test script - name: script - image: khs1994/php:8.2.13-fpm-alpine + image: khs1994/php:8.3.0-fpm-alpine # pull: always | never | if-not-exists # detach: true # privileged: true @@ -92,7 +92,7 @@ steps: settings: # registry: docker.khs1994.com repo: khs1994/php - tags: 8.2.13-pro-${DRONE_TAG}-alpine + tags: 8.3.0-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com # build_args: @@ -142,7 +142,7 @@ steps: image: plugins/docker settings: repo: khs1994/php - tags: 8.2.13-pro-${DRONE_TAG}-alpine + tags: 8.3.0-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com username: @@ -179,7 +179,7 @@ steps: event: [ tag ] - name: after_success - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine when: status: success commands: @@ -228,7 +228,7 @@ volumes: # COMPOSER_VERSION: # - 2.5.8 # PHP_VERSION: -# - 8.2.13 +# - 8.3.0 # - 8.1.26 # - 8.0.30 # # - 7.4.33 diff --git a/app/demo/.env.example b/app/demo/.env.example index 9cd42d89f..f7c2ac969 100644 --- a/app/demo/.env.example +++ b/app/demo/.env.example @@ -1,6 +1,6 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION=8.2.13 +PHP_VERSION=8.3.0 # PHP_VERSION=8.1.26 # PHP_VERSION=8.0.30 # PHP_VERSION=7.4.33 diff --git a/app/demo/.pcit.yml b/app/demo/.pcit.yml index 30f6fb5fc..43b3fe148 100644 --- a/app/demo/.pcit.yml +++ b/app/demo/.pcit.yml @@ -16,7 +16,7 @@ steps: # install dep install: # image: composer:${COMPOSER_VERSION} - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine shell: bash run: - pwd @@ -80,7 +80,7 @@ steps: event: tag after_success: - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine shell: bash if: status: success @@ -129,7 +129,7 @@ jobs: COMPOSER_VERSION: - 2.5.8 PHP_VERSION: - - 8.2.13 + - 8.3.0 - 8.1.26 - 8.0.30 # - 7.4.33 diff --git a/app/demo/Dockerfile b/app/demo/Dockerfile index 671688ea5..37e882b69 100644 --- a/app/demo/Dockerfile +++ b/app/demo/Dockerfile @@ -9,7 +9,7 @@ # !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !! ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 ARG NGINX_VERSION=1.15.0 ARG DOCKER_HUB_USERNAME=khs1994 @@ -28,7 +28,7 @@ RUN cd /app \ --no-plugins # 2.将项目打入 PHP 镜像 -# $ docker build -t khs1994/php:8.2.13-pro-GIT_TAG-alpine --target=php . +# $ docker build -t khs1994/php:8.3.0-pro-GIT_TAG-alpine --target=php . FROM ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION}-fpm-alpine as php diff --git a/app/demo/deploy/test.Dockerfile b/app/demo/deploy/test.Dockerfile index 821d30408..03cc38de7 100644 --- a/app/demo/deploy/test.Dockerfile +++ b/app/demo/deploy/test.Dockerfile @@ -2,7 +2,7 @@ # TEST PHP PROJECT BY Docker # -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 ARG GIT_REPO={{ EXAMPLE_GIT_URL_EXAMPLE }}/{{ EXAMPLE_GIT_USERNAME_EXAMPLE }}/{{ EXAMPLE_GIT_REPO_EXAMPLE }}.git FROM khs1994/php:${PHP_VERSION}-composer-alpine diff --git a/app/demo/docker-compose.yml b/app/demo/docker-compose.yml index 7d95638dc..540d64e51 100644 --- a/app/demo/docker-compose.yml +++ b/app/demo/docker-compose.yml @@ -19,7 +19,7 @@ services: context: . dockerfile: deploy/test.Dockerfile args: - - PHP_VERSION=${PHP_VERSION:-8.2.13} + - PHP_VERSION=${PHP_VERSION:-8.3.0} image: ${DOCKER_HUB_USERNAME:-khs1994}/EXAMPLE nginx: @@ -39,7 +39,7 @@ services: dockerfile: Dockerfile target: php args: - - PHP_VERSION=${PHP_VERSION:-8.2.13} + - PHP_VERSION=${PHP_VERSION:-8.3.0} - NODE_VERSION=${NODE_VERSION:-20.5.1} - NODE_REGISTRY=https://registry.npmmirror.com - image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.13}-pro-alpine + image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.3.0}-pro-alpine diff --git a/app/demo/docker-workspace.yml b/app/demo/docker-workspace.yml index 80c1fb616..f9811af10 100644 --- a/app/demo/docker-workspace.yml +++ b/app/demo/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine networks: - backend volumes: @@ -67,7 +67,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.13-composer-alpine" + image: "khs1994/php:8.3.0-composer-alpine" command: [] # install | update npm: diff --git a/app/laravel-demo/.github/workflows/ci-cdn.yaml b/app/laravel-demo/.github/workflows/ci-cdn.yaml index bef98ee2f..83ad979c1 100644 --- a/app/laravel-demo/.github/workflows/ci-cdn.yaml +++ b/app/laravel-demo/.github/workflows/ci-cdn.yaml @@ -26,10 +26,10 @@ jobs: - uses: docker-practice/actions-setup-docker@master with: docker_channel: test - docker_version: "20.10" + docker_version: "23.11" - uses: khs1994-docker/actions-setup-lnmp@master with: - lnmp_branch: "20.10" + lnmp_branch: "23.11" lnmp_services: "nginx mysql php8 redis minio" lrew_include: "minio" - name: Init LNMP diff --git a/app/laravel-demo/.github/workflows/ci.yaml b/app/laravel-demo/.github/workflows/ci.yaml index a4913d67d..0628da9a0 100644 --- a/app/laravel-demo/.github/workflows/ci.yaml +++ b/app/laravel-demo/.github/workflows/ci.yaml @@ -30,10 +30,10 @@ jobs: - uses: docker-practice/actions-setup-docker@master with: docker_channel: test - docker_version: "20.10" + docker_version: "23.11" - uses: khs1994-docker/actions-setup-lnmp@master with: - lnmp_branch: "20.10" + lnmp_branch: "23.11" lnmp_services: "laravel nginx mysql php8 redis" lrew_include: "laravel" - name: Init LNMP diff --git a/app/laravel-demo/Dockerfile b/app/laravel-demo/Dockerfile index 1cb44e0da..f99e0a8d0 100644 --- a/app/laravel-demo/Dockerfile +++ b/app/laravel-demo/Dockerfile @@ -14,12 +14,12 @@ # $ docker build --target=laravel -t khs1994/laravel:10 --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.3.0-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.buildkit b/app/laravel-demo/Dockerfile.buildkit index 91847b449..6d86901d5 100644 --- a/app/laravel-demo/Dockerfile.buildkit +++ b/app/laravel-demo/Dockerfile.buildkit @@ -16,12 +16,12 @@ # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.buildkit --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.3.0-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY --link composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.cdn b/app/laravel-demo/Dockerfile.cdn index 36bbed815..9824b9d80 100644 --- a/app/laravel-demo/Dockerfile.cdn +++ b/app/laravel-demo/Dockerfile.cdn @@ -15,12 +15,12 @@ # # $ 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.13 +ARG PHP_VERSION=8.3.0 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.3.0-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/docker-lnmp.override.example.yml b/docker-lnmp.override.example.yml index ffadb1398..17d591152 100644 --- a/docker-lnmp.override.example.yml +++ b/docker-lnmp.override.example.yml @@ -27,11 +27,11 @@ services: # php8: # &php8 # # ! change php8 default image - # image: username/php:${LNMP_PHP8_VERSION:-8.2.13}-fpm-alpine + # image: username/php:${LNMP_PHP8_VERSION:-8.3.0}-fpm-alpine # # ! cn mirror image - # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.13}-fpm-alpine + # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.3.0}-fpm-alpine # # ! s6 - # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.13}-s6-alpine + # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.3.0}-s6-alpine # # command: [] # # ! open more port # ports: @@ -74,7 +74,7 @@ services: swoole: << : *common - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-swoole-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.3.0}-swoole-alpine # command 指令只需传入文件名即可 command: - /app/swoole/index.php diff --git a/docker-lnmp.yml b/docker-lnmp.yml index 48f3a6122..0d728675a 100644 --- a/docker-lnmp.yml +++ b/docker-lnmp.yml @@ -169,7 +169,7 @@ services: php8: &php8 << : [*common,*common-labels] - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.13}-fpm-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.3.0}-fpm-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} @@ -220,7 +220,7 @@ services: composer: << : [*common,*common-labels] restart: "no" - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.3.0}-composer-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} diff --git a/docker-production.yml b/docker-production.yml index b3f40f3da..cb82dba2e 100644 --- a/docker-production.yml +++ b/docker-production.yml @@ -74,7 +74,7 @@ x-build-debian: x-php-common: &default-php - image: khs1994/php:8.2.13-fpm-alpine + image: khs1994/php:8.3.0-fpm-alpine volumes: - ./app:/app - type: volume @@ -364,7 +364,7 @@ services: - *common - *default-labels - *default-php - # image: khs1994/php:8.2.13-s6-alpine + # image: khs1994/php:8.3.0-s6-alpine # entrypoint: # - /s6-init build: diff --git a/docker-workspace.example.yml b/docker-workspace.example.yml index 7ad68ab1b..1db925de3 100644 --- a/docker-workspace.example.yml +++ b/docker-workspace.example.yml @@ -11,7 +11,7 @@ x-common: services: workspace: &workspace - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.3.0}-composer-alpine networks: - backend volumes: @@ -71,7 +71,7 @@ services: << : - *workspace - *common - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.3.0}-composer-alpine" command: [] # install | update npm: diff --git a/dockerfile/php/sync/Dockerfile b/dockerfile/php/sync/Dockerfile index 1ebd34c35..629c90f16 100644 --- a/dockerfile/php/sync/Dockerfile +++ b/dockerfile/php/sync/Dockerfile @@ -7,8 +7,8 @@ ARG DEST_DOCKER_USERNAME=906210846@qq.com ARG DEST_DOCKER_PASSWORD=fix_me ARG DEST_NAMESPACE=khs1994 # fix me 必须替换为自己的配置文件 -# ARG CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync-by-docker.json -ARG CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/20.10/dockerfile/php/sync/docker-image-sync.json +# ARG CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync-by-docker.json +ARG CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/23.11/dockerfile/php/sync/docker-image-sync.json # ARG SOURCE_DOCKER_REGISTRY=registry-1.docker.io # ARG SOURCE_DOCKER_REGISTRY=hub-mirror.c.163.com diff --git a/dockerfile/php/sync/Jenkinsfile b/dockerfile/php/sync/Jenkinsfile index 130c189a6..544d95137 100644 --- a/dockerfile/php/sync/Jenkinsfile +++ b/dockerfile/php/sync/Jenkinsfile @@ -21,7 +21,7 @@ pipeline { stage('同步镜像-tencent-cloud') { steps { - sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/php/sync/docker-image-sync.json" + sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/php/sync/docker-image-sync.json" sh ''' docker run -i --rm \ @@ -33,7 +33,7 @@ pipeline { -e DEST_NAMESPACE=\${DEST_NAMESPACE} \ -e CI=true \ -e DOCKER_TOKEN_EXPIRE_TIME=115 \ - -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/php/sync/docker-image-sync.json \ + -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/php/sync/docker-image-sync.json \ -v \$PWD/docker-image-sync.json:/docker-entrypoint.d/docker-image-sync.json \ pcit-docker.pkg.coding.net/khs1994-docker/khs1994/docker-image-sync ''' diff --git a/dockerfile/php/sync/docker-image-sync.json b/dockerfile/php/sync/docker-image-sync.json index 715a31ef5..17105e9e9 100644 --- a/dockerfile/php/sync/docker-image-sync.json +++ b/dockerfile/php/sync/docker-image-sync.json @@ -1,57 +1,57 @@ [ { - "source": "php:8.2.13-cli-alpine" + "source": "php:8.3.0-cli-alpine" }, { - "source": "php:8.2.13-fpm-alpine" + "source": "php:8.3.0-fpm-alpine" }, { - "source": "php:8.2.13-unit-alpine" + "source": "php:8.3.0-unit-alpine" }, { - "source": "php:8.2.13-composer-alpine" + "source": "php:8.3.0-composer-alpine" }, { - "source": "php:8.2.13-swoole-alpine" + "source": "php:8.3.0-swoole-alpine" }, { - "source": "php:8.2.13-s6-alpine" + "source": "php:8.3.0-s6-alpine" }, { - "source": "php:8.1.26-cli-alpine" + "source": "php:8.2.13-cli-alpine" }, { - "source": "php:8.1.26-fpm-alpine" + "source": "php:8.2.13-fpm-alpine" }, { - "source": "php:8.1.26-unit-alpine" + "source": "php:8.2.13-unit-alpine" }, { - "source": "php:8.1.26-composer-alpine" + "source": "php:8.2.13-composer-alpine" }, { - "source": "php:8.1.26-swoole-alpine" + "source": "php:8.2.13-swoole-alpine" }, { - "source": "php:8.1.26-s6-alpine" + "source": "php:8.2.13-s6-alpine" }, { - "source": "php:8.0.30-cli-alpine" + "source": "php:8.1.26-cli-alpine" }, { - "source": "php:8.0.30-fpm-alpine" + "source": "php:8.1.26-fpm-alpine" }, { - "source": "php:8.0.30-unit-alpine" + "source": "php:8.1.26-unit-alpine" }, { - "source": "php:8.0.30-composer-alpine" + "source": "php:8.1.26-composer-alpine" }, { - "source": "php:8.0.30-swoole-alpine" + "source": "php:8.1.26-swoole-alpine" }, { - "source": "php:8.0.30-s6-alpine" + "source": "php:8.1.26-s6-alpine" }, { "source": "php:nightly-cli-alpine" diff --git a/dockerfile/php/sync/manifest.txt b/dockerfile/php/sync/manifest.txt index 2df0e95ab..6d258d0fa 100644 --- a/dockerfile/php/sync/manifest.txt +++ b/dockerfile/php/sync/manifest.txt @@ -1,3 +1,9 @@ +8.3.0-cli-alpine +8.3.0-fpm-alpine +8.3.0-unit-alpine +8.3.0-composer-alpine +8.3.0-swoole-alpine +8.3.0-s6-alpine 8.2.13-cli-alpine 8.2.13-fpm-alpine 8.2.13-unit-alpine diff --git a/dockerfile/sync/Dockerfile b/dockerfile/sync/Dockerfile index 8c630fd15..d7bb18a28 100644 --- a/dockerfile/sync/Dockerfile +++ b/dockerfile/sync/Dockerfile @@ -9,8 +9,8 @@ ARG DEST_DOCKER_USERNAME ARG DEST_DOCKER_PASSWORD ARG DEST_NAMESPACE # fix me 必须替换为自己的配置文件 -# ARG CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync-by-docker.json -ARG CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync-by-docker.json +# ARG CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync-by-docker.json +ARG CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync-by-docker.json # ARG SOURCE_DOCKER_REGISTRY=registry-1.docker.io # ARG SOURCE_DOCKER_REGISTRY=hub-mirror.c.163.com @@ -21,7 +21,7 @@ ENV DEST_DOCKER_USERNAME=$DEST_DOCKER_USERNAME ENV DEST_DOCKER_PASSWORD=$DEST_DOCKER_PASSWORD ENV DEST_NAMESPACE=$DEST_NAMESPACE # ENV CONFIG_URL=$CONFIG_URL -ENV CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync-by-docker.json +ENV CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync-by-docker.json # ENV SOURCE_DOCKER_REGISTRY=$SOURCE_DOCKER_REGISTRY # 更多环境变量请查看 https://github.com/khs1994-docker/lnmp/blob/master/windows/docker-image-sync.Dockerfile diff --git a/dockerfile/sync/Jenkinsfile b/dockerfile/sync/Jenkinsfile index d65142881..e5a041e02 100644 --- a/dockerfile/sync/Jenkinsfile +++ b/dockerfile/sync/Jenkinsfile @@ -74,7 +74,7 @@ pipeline { stage('同步镜像') { steps { - sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync.json" + sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync.json" sh ''' docker run -i --rm \ @@ -86,7 +86,7 @@ pipeline { -e DEST_DOCKER_REGISTRY=\${DEST_DOCKER_REGISTRY} \ -e DEST_NAMESPACE=\${REGISTRY_NAMESPACE} \ -e CI=true \ - -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync.json \ + -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync.json \ -v \$PWD/docker-image-sync.json:/docker-entrypoint.d/docker-image-sync.json \ pcit-docker.pkg.coding.net/khs1994-docker/khs1994/docker-image-sync ''' diff --git a/docs/custom.md b/docs/custom.md index 642e4488d..cea455b10 100644 --- a/docs/custom.md +++ b/docs/custom.md @@ -37,7 +37,7 @@ services: php8: # 想修改哪个配置在这里重写即可，例如想使用自己的 PHP 镜像或国内镜像，那么增加 `image` 指令即可 - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.3.0}-fpm-alpine ``` 你也可以加上 `build` 字段，先构建镜像再启动 @@ -48,7 +48,7 @@ services: services: php8: - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.3.0}-fpm-alpine # 增加 build 字段 build: context: ./dockerfile/php/ diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index 733817245..9f683f892 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -158,7 +158,7 @@ jobs: sudo go env GOPATH sudo go version - git clone --depth=1 -b 20.10 https://github.com/khs1994-docker/lnmp ~/lnmp + git clone --depth=1 -b 23.11 https://github.com/khs1994-docker/lnmp ~/lnmp cp -r ~/lnmp/. /home/runner/work/lnmp-k8s ls -la /home/runner/work/lnmp-k8s # remove some apt source diff --git a/kubernetes/kubernetes-release/sync/Jenkinsfile b/kubernetes/kubernetes-release/sync/Jenkinsfile index e3fc0bc78..eb44989eb 100644 --- a/kubernetes/kubernetes-release/sync/Jenkinsfile +++ b/kubernetes/kubernetes-release/sync/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { // steps { // // sh "pwsh -c 'echo $env:LWPM_DOCKER_USERNAME' " // // sh "pwsh -c 'echo $env:LWPM_DOCKER_PASSWORD' " - // // sh "git clone --depth=1 -b 20.10 https://github.com/khs1994-docker/lnmp" + // // sh "git clone --depth=1 -b 23.11 https://github.com/khs1994-docker/lnmp" // // sh "pwsh ./lnmp/kubernetes/bin/lwpm.ps1" // sh "docker run -i --rm -e LWPM_DOCKER_USERNAME \ // -e LWPM_DOCKER_PASSWORD \ @@ -75,7 +75,7 @@ pipeline { stage('同步镜像') { steps { - sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/20.10/kubernetes/kubernetes-release/sync/docker-image-sync.json" + sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/23.11/kubernetes/kubernetes-release/sync/docker-image-sync.json" sh ''' sed -i -e "s#K8S_VERSION#${LWPM_K8S_VERSION}#g" \ @@ -94,7 +94,7 @@ pipeline { -e DEST_DOCKER_REGISTRY=\${LWPM_DOCKER_REGISTRY_MIRROR} \ -e SYNC_WINDOWS=true \ -e CI=true \ - -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/20.10/kubernetes/kubernetes-release/sync/docker-image-sync.json \ + -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/kubernetes/kubernetes-release/sync/docker-image-sync.json \ -v \$PWD/docker-image-sync.json:/docker-entrypoint.d/docker-image-sync.json \ pcit-docker.pkg.coding.net/khs1994-docker/khs1994/docker-image-sync" } diff --git a/kubernetes/lnmp/php/base/lnmp-php.yaml b/kubernetes/lnmp/php/base/lnmp-php.yaml index 434218096..1a94f57fc 100644 --- a/kubernetes/lnmp/php/base/lnmp-php.yaml +++ b/kubernetes/lnmp/php/base/lnmp-php.yaml @@ -44,7 +44,7 @@ spec: kubernetes.io/os: linux containers: - name: lnmp-php - image: khs1994/php:8.2.13-fpm-alpine + image: khs1994/php:8.3.0-fpm-alpine imagePullPolicy: IfNotPresent args: - php-fpm diff --git a/lnmp-docker.ps1 b/lnmp-docker.ps1 index c80556413..9f51f573c 100755 --- a/lnmp-docker.ps1 +++ b/lnmp-docker.ps1 @@ -49,7 +49,7 @@ $env:COMPOSE_FILE = $null if ($args[0] -eq "install") { if (get-command git) { - git clone -b 20.10 --depth=1 https://github.com/khs1994-docker/lnmp.git $home\lnmp + git clone -b 23.11 --depth=1 https://github.com/khs1994-docker/lnmp.git $home\lnmp exit } diff --git a/lrew/nginx-unit/docker-compose.yml b/lrew/nginx-unit/docker-compose.yml index 24ed71454..48ec70d62 100644 --- a/lrew/nginx-unit/docker-compose.yml +++ b/lrew/nginx-unit/docker-compose.yml @@ -20,7 +20,7 @@ services: << : - *common - *common-label - image: "khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-unit-alpine" + image: "khs1994/php:${LNMP_PHP_VERSION:-8.3.0}-unit-alpine" volumes: - ./config/${LNMP_NGINX_UNIT_CONF:-nginx-unit}:/etc/nginx-unit # ./path/unit-init-conf:/docker-entrypoint.d diff --git a/renovate.json b/renovate.json index 956902a5a..c08fdcb57 100644 --- a/renovate.json +++ b/renovate.json @@ -6,7 +6,7 @@ "khs1994" ], "baseBranches": [ - "20.10" + "23.11" ], "commitBody": "[skip ci]", "labels": [ diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index e84dc88e4..a3f38b232 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -12,7 +12,7 @@ services: image: memcached:1.6.15-alpine php: - image: php:8.2.13-fpm-alpine + image: php:8.3.0-fpm-alpine composer: image: composer:2.5.8 diff --git a/vscode-remote/docker-workspace.yml b/vscode-remote/docker-workspace.yml index e0b80d3d3..0675472f2 100644 --- a/vscode-remote/docker-workspace.yml +++ b/vscode-remote/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine networks: - backend volumes: @@ -68,7 +68,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.13-composer-alpine" + image: "khs1994/php:8.3.0-composer-alpine" command: [] # install | update npm: diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.json b/windows/lnmp-windows-pm-repo/php/lwpm.json index 4d6f90c33..b271985d7 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php/lwpm.json @@ -10,7 +10,7 @@ "C:\\php", "C:\\php-pre" ], - "pre-version": "8.2.13", + "pre-version": "8.3.0", "releases": "https://www.php.net/downloads.php", "scripts": { "get-version": "if(!($VERSION)){\n$VERSION=$stable_version\n}\nif($isPre){\n$VC_VERSION=\"nts-Win32-vs16\"\n$VERSION=$pre_version\n$url=\"https://windows.php.net/downloads/qa/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/qa/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php-pre\"\n$global:PHP_PREFIX=\"C:\\php-pre\"\n}else{\n$VC_VERSION=\"nts-Win32-vs16\"\n$url=\"https://windows.php.net/downloads/releases/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/releases/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php\"\n$global:PHP_PREFIX=\"C:\\php\"\n}", @@ -32,5 +32,5 @@ "uninstall": "if($isPre -eq 1){_cleanup \"C:\\php-pre\"}else{_cleanup \"C:\\php\"}\n", "version": "(php -v).split(\" \")[1]" }, - "version": "8.2.13" + "version": "8.3.0" } diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.yaml b/windows/lnmp-windows-pm-repo/php/lwpm.yaml index 0897440a8..aac64782f 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php/lwpm.yaml @@ -1,7 +1,7 @@ name: "php" description: "PHP is a popular general-purpose scripting language that is especially suited to web development" -version: "8.2.13" -pre-version: "8.2.13" +version: "8.3.0" +pre-version: "8.3.0" homepage: "https://www.php.net/" bug: "https://www.php.net/" github: "php/php-src" diff --git a/wsl/Dockerfile b/wsl/Dockerfile index 837711c2a..a01b81e74 100755 --- a/wsl/Dockerfile +++ b/wsl/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim ################################################################################ -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 ARG PHP_NUM=82 diff --git a/wsl/lnmp-wsl-builder-php b/wsl/lnmp-wsl-builder-php index 2b7af4306..a24b53875 100755 --- a/wsl/lnmp-wsl-builder-php +++ b/wsl/lnmp-wsl-builder-php @@ -66,7 +66,7 @@ export TZ=Asia/Shanghai # export CC=clang CXX=clang export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.13 +export PHP_LATEST_VERSION=8.3.0 ################################################################################ for command in "$@" diff --git a/wsl/lnmp-wsl-builder-php-rhel b/wsl/lnmp-wsl-builder-php-rhel index cf1f3aec3..c2cf5f382 100755 --- a/wsl/lnmp-wsl-builder-php-rhel +++ b/wsl/lnmp-wsl-builder-php-rhel @@ -56,7 +56,7 @@ export TZ=Asia/Shanghai # export CC=clang CXX=clang # export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.13 +export PHP_LATEST_VERSION=8.3.0 ################################################################################ # diff --git a/wsl/wsl.phpbuilder.Dockerfile b/wsl/wsl.phpbuilder.Dockerfile index 50a772dea..c887a9c70 100755 --- a/wsl/wsl.phpbuilder.Dockerfile +++ b/wsl/wsl.phpbuilder.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 COPY lnmp-wsl-builder-php /lnmp-wsl-builder-php.sh diff --git a/wsl/wsl.phpbuilder.rhel.Dockerfile b/wsl/wsl.phpbuilder.rhel.Dockerfile index f315a62b8..634f97933 100755 --- a/wsl/wsl.phpbuilder.rhel.Dockerfile +++ b/wsl/wsl.phpbuilder.rhel.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 COPY lnmp-wsl-builder-php-rhel /lnmp-wsl-builder-php-rhel.sh