From 55055209e7edd4763fe99cdef2759cad91f01a37 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 11 Feb 2024 13:46:14 +0800 Subject: [PATCH] [PHP] update to v8.2.13 v8.1.26 v8.0.30 Signed-off-by: Kang Huaishuai --- .env.example | 8 ++-- .env.example.ps1 | 2 +- .../setup-php/.github/workflows/ci.yaml | 4 +- .github/actions/setup-php/action.yml | 2 +- .github/actions/setup-php/package.json | 2 +- .github/workflows/release.yaml | 22 +++++----- .pcit.yml | 2 +- CHANGELOG.md | 2 +- README.cn.md | 6 +-- README.md | 6 +-- app/demo/.drone.yml | 14 +++--- app/demo/.env.example | 4 +- app/demo/.github/workflows/ci.yml | 2 +- app/demo/.pcit.yml | 8 ++-- app/demo/Dockerfile | 4 +- app/demo/deploy/test.Dockerfile | 2 +- app/demo/docker-compose.yml | 6 +-- app/demo/docker-workspace.yml | 4 +- app/laravel-demo/Dockerfile | 4 +- app/laravel-demo/Dockerfile.buildkit | 4 +- app/laravel-demo/Dockerfile.cdn | 4 +- docker-lnmp.override.example.yml | 8 ++-- docker-lnmp.yml | 4 +- docker-production.yml | 4 +- docker-workspace.example.yml | 4 +- dockerfile/php/.env.example | 4 +- dockerfile/php/.github/workflows/php_8_1.yml | 4 +- dockerfile/php/.github/workflows/php_8_2.yml | 4 +- .../php/.github/workflows/php_zz_tool.yml | 4 +- dockerfile/php/8.1/cli/Dockerfile | 6 +-- dockerfile/php/8.1/composer/Dockerfile | 2 +- dockerfile/php/8.1/fpm/Dockerfile | 4 +- dockerfile/php/8.1/s6/Dockerfile | 2 +- dockerfile/php/8.1/swoole/Dockerfile | 4 +- dockerfile/php/8.1/unit/Dockerfile | 2 +- dockerfile/php/8.2/cli/Dockerfile | 6 +-- dockerfile/php/8.2/composer/Dockerfile | 2 +- dockerfile/php/8.2/fpm/Dockerfile | 4 +- dockerfile/php/8.2/s6/Dockerfile | 2 +- dockerfile/php/8.2/swoole/Dockerfile | 4 +- dockerfile/php/8.2/unit/Dockerfile | 2 +- dockerfile/php/8.3/cli/Dockerfile | 2 +- dockerfile/php/8.3/fpm/Dockerfile | 2 +- dockerfile/php/CHANGELOG.md | 8 +++- dockerfile/php/README.md | 26 +++++------ dockerfile/php/nightly/cli/Dockerfile | 2 +- dockerfile/php/nightly/fpm/Dockerfile | 2 +- dockerfile/php/php-cs-fixer/Dockerfile | 2 +- dockerfile/php/phploc/Dockerfile | 2 +- dockerfile/php/sync/docker-image-sync.json | 24 +++++----- dockerfile/php/sync/manifest.txt | 24 +++++----- dockerfile/php/tests/git/Dockerfile | 2 +- dockerfile/sync/docker-image-sync.json | 12 ++--- docs/custom.md | 4 +- kubernetes/lnmp/php/base/lnmp-php.yaml | 2 +- lrew/nginx-unit/docker-compose.yml | 2 +- scripts/docker-compose.bump.yml | 2 +- vscode-remote/docker-workspace.yml | 4 +- windows/lnmp-windows-pm-repo/php/lwpm.json | 4 +- windows/lnmp-windows-pm-repo/php/lwpm.yaml | 4 +- wsl/.env | 4 +- wsl/Dockerfile | 2 +- wsl/docker-compose.yml | 44 +++++++++---------- wsl/lnmp-wsl-builder-php | 2 +- wsl/lnmp-wsl-builder-php-rhel | 2 +- wsl/wsl.phpbuilder.Dockerfile | 2 +- wsl/wsl.phpbuilder.rhel.Dockerfile | 2 +- 67 files changed, 191 insertions(+), 185 deletions(-) diff --git a/.env.example b/.env.example index a73e92c1b..30100c20e 100644 --- a/.env.example +++ b/.env.example @@ -123,7 +123,7 @@ LNMP_NGINX_VERSION=1.25.3 LNMP_MYSQL_VERSION=8.0.33 -LNMP_PHP_VERSION=8.2.10 +LNMP_PHP_VERSION=8.2.13 # LNMP_PHP_VERSION=nightly # PHP EOL VERSION @@ -137,10 +137,10 @@ LNMP_PHP73_VERSION=7.3.33 LNMP_PHP74_VERSION=7.4.33 # PHP EOL VERSION END -LNMP_PHP8_VERSION=8.2.10 +LNMP_PHP8_VERSION=8.2.13 LNMP_PHP80_VERSION=8.0.30 -LNMP_PHP81_VERSION=8.1.23 -LNMP_PHP82_VERSION=8.2.10 +LNMP_PHP81_VERSION=8.1.26 +LNMP_PHP82_VERSION=8.2.13 LNMP_PHP83_VERSION=8.3.0 LNMP_REDIS_VERSION=7.0.0 diff --git a/.env.example.ps1 b/.env.example.ps1 index 55d53799c..e001b666d 100644 --- a/.env.example.ps1 +++ b/.env.example.ps1 @@ -7,7 +7,7 @@ $CI_HOST="ci.khs1994.com:1218" # $ wsl -l $DistributionName="Ubuntu-22.04" -$LNMP_PHP_IMAGE="khs1994/php:8.2.10-composer-alpine" +$LNMP_PHP_IMAGE="khs1994/php:8.2.13-composer-alpine" $NGINX_PATH="C:/nginx" $PHP_PATH="C:/php" diff --git a/.github/actions/setup-php/.github/workflows/ci.yaml b/.github/actions/setup-php/.github/workflows/ci.yaml index ecfaf874f..549794e25 100644 --- a/.github/actions/setup-php/.github/workflows/ci.yaml +++ b/.github/actions/setup-php/.github/workflows/ci.yaml @@ -10,8 +10,8 @@ jobs: matrix: php_version: - nightly - - 8.2.10 - - 8.1.23 + - 8.2.13 + - 8.1.26 - 8.0.30 # EOL - 7.4.33 diff --git a/.github/actions/setup-php/action.yml b/.github/actions/setup-php/action.yml index 02fa2959c..f8682ad7c 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.10" + default: "8.2.13" 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 fb719b8be..54c658aec 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.10' 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.13' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" }, "author": "", "license": "ISC" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cd6c1b9d7..b5dfbcfae 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,33 +18,33 @@ jobs: - JOB_NAME: wsl-php-builder-80 DIST_FILE: khs1994-wsl-php80_8.0.30-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-81 - DIST_FILE: khs1994-wsl-php81_8.1.23-debian-bullseye_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-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.23-debian-bookworm_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-debian-bookworm_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu1804-74 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.30-ubuntu-bionic_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu1804-81 - DIST_FILE: khs1994-wsl-php81_8.1.23-ubuntu-bionic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-ubuntu-bionic_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2004-74 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.30-ubuntu-focal_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2004-81 - DIST_FILE: khs1994-wsl-php81_8.1.23-ubuntu-focal_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-ubuntu-focal_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-74 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.30-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-81 - DIST_FILE: khs1994-wsl-php81_8.1.23-ubuntu-jammy_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-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.23-ubuntu-kinetic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-ubuntu-kinetic_amd64.deb - JOB_NAME: wsl-php-builder-rhel7-74 DIST_FILE: khs1994-wsl-php74-7.4.33-1.el7.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel8-74 @@ -52,23 +52,23 @@ jobs: - JOB_NAME: wsl-php-builder-rhel8-80 DIST_FILE: khs1994-wsl-php80-8.0.30-1.el8.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel8-81 - DIST_FILE: khs1994-wsl-php81-8.1.23-1.el8.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.26-1.el8.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel9-74 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.30-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel9-81 - DIST_FILE: khs1994-wsl-php81-8.1.23-1.el9.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.26-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky8-81 - DIST_FILE: khs1994-wsl-php81-8.1.23-1.el8.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.26-1.el8.rocky.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky9-81 - DIST_FILE: khs1994-wsl-php81-8.1.23-1.el9.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.26-1.el9.rocky.x86_64.rpm - JOB_NAME: wsl-php-builder-fc36-74 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.30-1.fc36.x86_64.rpm - JOB_NAME: wsl-php-builder-fc36-81 - DIST_FILE: khs1994-wsl-php81-8.1.23-1.fc36.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.26-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 diff --git a/.pcit.yml b/.pcit.yml index 44552e830..9f3052b18 100644 --- a/.pcit.yml +++ b/.pcit.yml @@ -4,7 +4,7 @@ workspace: steps: bash: - image: khs1994/php:8.2.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine run: - pwd - bash ./lnmp-docker diff --git a/CHANGELOG.md b/CHANGELOG.md index a9e890b8a..64afb3610 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,6 @@ ### Updates: -* [PHP `8.2.10` `8.1.23` `8.0.30`](https://www.php.net/ChangeLog-8.php#8.1.23) +* [PHP `8.2.13` `8.1.26` `8.0.30`](https://www.php.net/ChangeLog-8.php#8.1.26) * [nginx `1.25.3`](https://nginx.org/en/CHANGES) * [Kubernetes `1.29.0`](https://hub.nuaa.cf/kubernetes/kubernetes/releases/tag/v1.29.0) diff --git a/README.cn.md b/README.cn.md index 1f8d34a9a..5fa1b4138 100644 --- a/README.cn.md +++ b/README.cn.md @@ -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.10-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.13-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.10-fpm-alpine` | **8.2.10** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.10-composer-alpine`| **2.5.8** |`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` | |[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 ba2d6e63a..95d097fe2 100644 --- a/README.md +++ b/README.md @@ -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.10-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.13-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.10-fpm-alpine` | **8.2.10** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.10-composer-alpine`| **2.5.8** |`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` | |[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 78b564ff1..57e34c629 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.10-composer-alpine + image: khs1994/php:8.2.13-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.10-fpm-alpine + image: khs1994/php:8.2.13-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.10-pro-${DRONE_TAG}-alpine + tags: 8.2.13-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.10-pro-${DRONE_TAG}-alpine + tags: 8.2.13-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.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine when: status: success commands: @@ -228,8 +228,8 @@ volumes: # COMPOSER_VERSION: # - 2.5.8 # PHP_VERSION: -# - 8.2.10 -# - 8.1.23 +# - 8.2.13 +# - 8.1.26 # - 8.0.30 # # - 7.4.33 # # - 7.3.33 diff --git a/app/demo/.env.example b/app/demo/.env.example index e7fef36c9..9cd42d89f 100644 --- a/app/demo/.env.example +++ b/app/demo/.env.example @@ -1,7 +1,7 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION=8.2.10 -# PHP_VERSION=8.1.23 +PHP_VERSION=8.2.13 +# PHP_VERSION=8.1.26 # PHP_VERSION=8.0.30 # PHP_VERSION=7.4.33 # PHP_VERSION=7.3.33 diff --git a/app/demo/.github/workflows/ci.yml b/app/demo/.github/workflows/ci.yml index ec162f597..6bf2e2f2b 100644 --- a/app/demo/.github/workflows/ci.yml +++ b/app/demo/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: test: strategy: matrix: - php_version: ["8.0.30","8.1.23","8.2.10"] + php_version: ["8.0.30","8.1.26","8.2.13"] runs-on: ubuntu-latest # needs: job steps: diff --git a/app/demo/.pcit.yml b/app/demo/.pcit.yml index dde14f2bf..30f6fb5fc 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.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine shell: bash run: - pwd @@ -80,7 +80,7 @@ steps: event: tag after_success: - image: khs1994/php:8.2.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine shell: bash if: status: success @@ -129,8 +129,8 @@ jobs: COMPOSER_VERSION: - 2.5.8 PHP_VERSION: - - 8.2.10 - - 8.1.23 + - 8.2.13 + - 8.1.26 - 8.0.30 # - 7.4.33 # - 7.3.33 diff --git a/app/demo/Dockerfile b/app/demo/Dockerfile index 28ebc17d3..671688ea5 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.10 +ARG PHP_VERSION=8.2.13 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.10-pro-GIT_TAG-alpine --target=php . +# $ docker build -t khs1994/php:8.2.13-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 1f26f4dbf..821d30408 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.10 +ARG PHP_VERSION=8.2.13 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 eba27032c..7d95638dc 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.10} + - PHP_VERSION=${PHP_VERSION:-8.2.13} image: ${DOCKER_HUB_USERNAME:-khs1994}/EXAMPLE nginx: @@ -39,7 +39,7 @@ services: dockerfile: Dockerfile target: php args: - - PHP_VERSION=${PHP_VERSION:-8.2.10} + - PHP_VERSION=${PHP_VERSION:-8.2.13} - NODE_VERSION=${NODE_VERSION:-20.5.1} - NODE_REGISTRY=https://registry.npmmirror.com - image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.10}-pro-alpine + image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.13}-pro-alpine diff --git a/app/demo/docker-workspace.yml b/app/demo/docker-workspace.yml index 0e375b5e8..80c1fb616 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.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine networks: - backend volumes: @@ -67,7 +67,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.10-composer-alpine" + image: "khs1994/php:8.2.13-composer-alpine" command: [] # install | update npm: diff --git a/app/laravel-demo/Dockerfile b/app/laravel-demo/Dockerfile index d52969273..1cb44e0da 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.10 +ARG PHP_VERSION=8.2.13 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.10-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-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 79fba601f..91847b449 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.10 +ARG PHP_VERSION=8.2.13 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.10-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-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 a4274f185..36bbed815 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.10 +ARG PHP_VERSION=8.2.13 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.10-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-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 94a808957..ffadb1398 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.10}-fpm-alpine + # image: username/php:${LNMP_PHP8_VERSION:-8.2.13}-fpm-alpine # # ! cn mirror image - # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.10}-fpm-alpine + # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.13}-fpm-alpine # # ! s6 - # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.10}-s6-alpine + # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.13}-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.10}-swoole-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-swoole-alpine # command 指令只需传入文件名即可 command: - /app/swoole/index.php diff --git a/docker-lnmp.yml b/docker-lnmp.yml index ec7038485..48f3a6122 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.10}-fpm-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.13}-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.10}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} diff --git a/docker-production.yml b/docker-production.yml index a95a23634..b3f40f3da 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.10-fpm-alpine + image: khs1994/php:8.2.13-fpm-alpine volumes: - ./app:/app - type: volume @@ -364,7 +364,7 @@ services: - *common - *default-labels - *default-php - # image: khs1994/php:8.2.10-s6-alpine + # image: khs1994/php:8.2.13-s6-alpine # entrypoint: # - /s6-init build: diff --git a/docker-workspace.example.yml b/docker-workspace.example.yml index 49c3a0a14..7ad68ab1b 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.10}-composer-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine networks: - backend volumes: @@ -71,7 +71,7 @@ services: << : - *workspace - *common - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.10}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine" command: [] # install | update npm: diff --git a/dockerfile/php/.env.example b/dockerfile/php/.env.example index 452e76353..c454f3c21 100644 --- a/dockerfile/php/.env.example +++ b/dockerfile/php/.env.example @@ -1,8 +1,8 @@ DOCKER_HUB_USERNAME=khs1994 PHP_VERSION_83=8.3.0 -PHP_VERSION_82=8.2.10 -PHP_VERSION_81=8.1.23 +PHP_VERSION_82=8.2.13 +PHP_VERSION_81=8.1.26 PHP_VERSION_80=8.0.30 # EOL PHP_VERSION_74=7.4.33 diff --git a/dockerfile/php/.github/workflows/php_8_1.yml b/dockerfile/php/.github/workflows/php_8_1.yml index 5b542c5df..23f7332e9 100644 --- a/dockerfile/php/.github/workflows/php_8_1.yml +++ b/dockerfile/php/.github/workflows/php_8_1.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.1.23" + default: "8.1.26" name: PHP_8.1 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_1_X FOLDER: "8.1" - PHP_TAG_VERSION: "8.1.23" + PHP_TAG_VERSION: "8.1.26" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_8_2.yml b/dockerfile/php/.github/workflows/php_8_2.yml index 733888b5c..e83b582ca 100644 --- a/dockerfile/php/.github/workflows/php_8_2.yml +++ b/dockerfile/php/.github/workflows/php_8_2.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.2.10" + default: "8.2.13" name: PHP_8.2 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_2_X FOLDER: "8.2" - PHP_TAG_VERSION: "8.2.10" + PHP_TAG_VERSION: "8.2.13" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_zz_tool.yml b/dockerfile/php/.github/workflows/php_zz_tool.yml index 42a9bc4db..f108d4b80 100644 --- a/dockerfile/php/.github/workflows/php_zz_tool.yml +++ b/dockerfile/php/.github/workflows/php_zz_tool.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.1.23" + default: "8.1.26" name: PHP_TOOL @@ -180,7 +180,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_1_X FOLDER: "8.1" - PHP_TAG_VERSION: "8.1.23" + PHP_TAG_VERSION: "8.1.26" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/8.1/cli/Dockerfile b/dockerfile/php/8.1/cli/Dockerfile index 12e946c9c..a0d161ed4 100644 --- a/dockerfile/php/8.1/cli/Dockerfile +++ b/dockerfile/php/8.1/cli/Dockerfile @@ -1,16 +1,16 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream -FROM --platform=$TARGETPLATFORM alpine:3.17 +FROM --platform=$TARGETPLATFORM alpine:3.19 LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.1/composer/Dockerfile b/dockerfile/php/8.1/composer/Dockerfile index f432e991b..06a56fade 100644 --- a/dockerfile/php/8.1/composer/Dockerfile +++ b/dockerfile/php/8.1/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli diff --git a/dockerfile/php/8.1/fpm/Dockerfile b/dockerfile/php/8.1/fpm/Dockerfile index 428dbd1a8..5be0dd912 100644 --- a/dockerfile/php/8.1/fpm/Dockerfile +++ b/dockerfile/php/8.1/fpm/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 -FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php +FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.19 as php LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/8.1/s6/Dockerfile b/dockerfile/php/8.1/s6/Dockerfile index a68fc559e..efe3fc1f2 100644 --- a/dockerfile/php/8.1/s6/Dockerfile +++ b/dockerfile/php/8.1/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.1/swoole/Dockerfile b/dockerfile/php/8.1/swoole/Dockerfile index 1b9ca16de..417ee44ba 100644 --- a/dockerfile/php/8.1/swoole/Dockerfile +++ b/dockerfile/php/8.1/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=v5.0.3 ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.1.23-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.1.26-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.1/unit/Dockerfile b/dockerfile/php/8.1/unit/Dockerfile index c55cfaf34..9c6ad64e3 100644 --- a/dockerfile/php/8.1/unit/Dockerfile +++ b/dockerfile/php/8.1/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/8.2/cli/Dockerfile b/dockerfile/php/8.2/cli/Dockerfile index 14eaaed4f..5bde626f9 100644 --- a/dockerfile/php/8.2/cli/Dockerfile +++ b/dockerfile/php/8.2/cli/Dockerfile @@ -1,16 +1,16 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream -FROM --platform=$TARGETPLATFORM alpine:3.17 +FROM --platform=$TARGETPLATFORM alpine:3.19 LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.2/composer/Dockerfile b/dockerfile/php/8.2/composer/Dockerfile index 9891d1dee..dd497a5ee 100644 --- a/dockerfile/php/8.2/composer/Dockerfile +++ b/dockerfile/php/8.2/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli diff --git a/dockerfile/php/8.2/fpm/Dockerfile b/dockerfile/php/8.2/fpm/Dockerfile index 6f8781e11..dbf41bd38 100644 --- a/dockerfile/php/8.2/fpm/Dockerfile +++ b/dockerfile/php/8.2/fpm/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 -FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php +FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.19 as php LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/8.2/s6/Dockerfile b/dockerfile/php/8.2/s6/Dockerfile index f6659d9f6..e25e4da9b 100644 --- a/dockerfile/php/8.2/s6/Dockerfile +++ b/dockerfile/php/8.2/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.2/swoole/Dockerfile b/dockerfile/php/8.2/swoole/Dockerfile index 9440baa57..fc839161a 100644 --- a/dockerfile/php/8.2/swoole/Dockerfile +++ b/dockerfile/php/8.2/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=v5.0.3 ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.2.10-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.2.13-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.2/unit/Dockerfile b/dockerfile/php/8.2/unit/Dockerfile index 14ff08d3f..3615d6297 100644 --- a/dockerfile/php/8.2/unit/Dockerfile +++ b/dockerfile/php/8.2/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/8.3/cli/Dockerfile b/dockerfile/php/8.3/cli/Dockerfile index 2539f1995..08a684fc1 100644 --- a/dockerfile/php/8.3/cli/Dockerfile +++ b/dockerfile/php/8.3/cli/Dockerfile @@ -3,7 +3,7 @@ ARG PHP_VERSION=8.3.0 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream -FROM --platform=$TARGETPLATFORM alpine:3.18 +FROM --platform=$TARGETPLATFORM alpine:3.19 LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/8.3/fpm/Dockerfile b/dockerfile/php/8.3/fpm/Dockerfile index 2ecb1a24f..90b3d19ec 100644 --- a/dockerfile/php/8.3/fpm/Dockerfile +++ b/dockerfile/php/8.3/fpm/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:labs ARG PHP_VERSION=8.3.0 -FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.18 as php +FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.19 as php LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/CHANGELOG.md b/dockerfile/php/CHANGELOG.md index 08cf06fcf..d348fd052 100644 --- a/dockerfile/php/CHANGELOG.md +++ b/dockerfile/php/CHANGELOG.md @@ -7,7 +7,7 @@ ## 8.4 -## Remove ext/imap — it has been moved to PECL +### Remove ext/imap — it has been moved to PECL * https://hub.nuaa.cf/php/php-src/commit/f62f6a6d4b9567530775d684db55e9990952c737 * https://hub.nuaa.cf/php/php-src/commits/master/ext/imap @@ -16,3 +16,9 @@ * https://hub.nuaa.cf/php/php-src/commit/b035cb6c8e31bea351f169b3e9f34fdc562e77e1 * https://hub.nuaa.cf/php/php-src/commits/master/ext/pspell + +## docker image ftp ext removed + +* 8.3.2(removed) +* 8.2.15(removed) +* 8.1.28(removed) diff --git a/dockerfile/php/README.md b/dockerfile/php/README.md index d6c0780e4..584e2f9d9 100644 --- a/dockerfile/php/README.md +++ b/dockerfile/php/README.md @@ -14,28 +14,28 @@ ## 后缀 -* 8.2.10-cli-alpine -* 8.2.10-fpm-alpine -* 8.2.10-unit-alpine (based cli) -* 8.2.10-composer-alpine (based fpm) -* 8.2.10-swoole-alpine (based cli) -* 8.2.10-s6-alpine (based fpm) +* 8.2.13-cli-alpine +* 8.2.13-fpm-alpine +* 8.2.13-unit-alpine (based cli) +* 8.2.13-composer-alpine (based fpm) +* 8.2.13-swoole-alpine (based cli) +* 8.2.13-s6-alpine (based fpm) ## Supported tags and respective `Dockerfile` links -* [`8.2.10-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.2/fpm/Dockerfile) +* [`8.2.13-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/8.2/fpm/Dockerfile) -* [`8.1.23-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.1/fpm/Dockerfile) +* [`8.1.26-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/8.1/fpm/Dockerfile) -* [`8.0.30-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.0/fpm/Dockerfile) +* [`8.0.30-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/8.0/fpm/Dockerfile) * [`nightly-fpm-alpine` (nightly/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/master/nightly/fpm/Dockerfile) -* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.4/fpm/Dockerfile) +* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/7.4/fpm/Dockerfile) -* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.3/fpm/Dockerfile) +* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/7.3/fpm/Dockerfile) -* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.2/fpm/Dockerfile) +* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/7.2/fpm/Dockerfile) ## Overview @@ -168,7 +168,7 @@ $ for ext in `ls /usr/src/php/ext`; do echo '*' $( php -r "if(extension_loaded(' * https://sources.debian.org/src/php7.4/7.4.33-1+deb11u1/debian/control/ -* https://sources.debian.org/src/php8.1/8.2.10-1/debian/control/ +* https://sources.debian.org/src/php8.1/8.2.13-1/debian/control/ * https://ram.tianon.xyz/post/2017/12/26/dockerize-compiled-software.html diff --git a/dockerfile/php/nightly/cli/Dockerfile b/dockerfile/php/nightly/cli/Dockerfile index 2621a1551..44acbc91f 100644 --- a/dockerfile/php/nightly/cli/Dockerfile +++ b/dockerfile/php/nightly/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -FROM --platform=$TARGETPLATFORM alpine:3.18 +FROM --platform=$TARGETPLATFORM alpine:3.19 LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/nightly/fpm/Dockerfile b/dockerfile/php/nightly/fpm/Dockerfile index 068a1b7c3..478a5829c 100644 --- a/dockerfile/php/nightly/fpm/Dockerfile +++ b/dockerfile/php/nightly/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -FROM --platform=$TARGETPLATFORM alpine:3.18 as php +FROM --platform=$TARGETPLATFORM alpine:3.19 as php LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/php-cs-fixer/Dockerfile b/dockerfile/php/php-cs-fixer/Dockerfile index 8a72f7389..9b4406fef 100644 --- a/dockerfile/php/php-cs-fixer/Dockerfile +++ b/dockerfile/php/php-cs-fixer/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/phploc/Dockerfile b/dockerfile/php/phploc/Dockerfile index 18a53f1f2..45c055501 100644 --- a/dockerfile/php/phploc/Dockerfile +++ b/dockerfile/php/phploc/Dockerfile @@ -4,7 +4,7 @@ ARG PHP_VERSION=7.4.33 ARG USERNAME=khs1994 ARG BASE=composer -FROM alpine:3.17 as phploc-downloader +FROM alpine:3.19 as phploc-downloader # Copy/Paste Detector (CPD) for PHP code. https://github.com/sebastianbergmann/phploc diff --git a/dockerfile/php/sync/docker-image-sync.json b/dockerfile/php/sync/docker-image-sync.json index 795568e21..715a31ef5 100644 --- a/dockerfile/php/sync/docker-image-sync.json +++ b/dockerfile/php/sync/docker-image-sync.json @@ -1,39 +1,39 @@ [ { - "source": "php:8.2.10-cli-alpine" + "source": "php:8.2.13-cli-alpine" }, { - "source": "php:8.2.10-fpm-alpine" + "source": "php:8.2.13-fpm-alpine" }, { - "source": "php:8.2.10-unit-alpine" + "source": "php:8.2.13-unit-alpine" }, { - "source": "php:8.2.10-composer-alpine" + "source": "php:8.2.13-composer-alpine" }, { - "source": "php:8.2.10-swoole-alpine" + "source": "php:8.2.13-swoole-alpine" }, { - "source": "php:8.2.10-s6-alpine" + "source": "php:8.2.13-s6-alpine" }, { - "source": "php:8.1.23-cli-alpine" + "source": "php:8.1.26-cli-alpine" }, { - "source": "php:8.1.23-fpm-alpine" + "source": "php:8.1.26-fpm-alpine" }, { - "source": "php:8.1.23-unit-alpine" + "source": "php:8.1.26-unit-alpine" }, { - "source": "php:8.1.23-composer-alpine" + "source": "php:8.1.26-composer-alpine" }, { - "source": "php:8.1.23-swoole-alpine" + "source": "php:8.1.26-swoole-alpine" }, { - "source": "php:8.1.23-s6-alpine" + "source": "php:8.1.26-s6-alpine" }, { "source": "php:8.0.30-cli-alpine" diff --git a/dockerfile/php/sync/manifest.txt b/dockerfile/php/sync/manifest.txt index 3d477ed62..2df0e95ab 100644 --- a/dockerfile/php/sync/manifest.txt +++ b/dockerfile/php/sync/manifest.txt @@ -1,15 +1,15 @@ -8.2.10-cli-alpine -8.2.10-fpm-alpine -8.2.10-unit-alpine -8.2.10-composer-alpine -8.2.10-swoole-alpine -8.2.10-s6-alpine -8.1.23-cli-alpine -8.1.23-fpm-alpine -8.1.23-unit-alpine -8.1.23-composer-alpine -8.1.23-swoole-alpine -8.1.23-s6-alpine +8.2.13-cli-alpine +8.2.13-fpm-alpine +8.2.13-unit-alpine +8.2.13-composer-alpine +8.2.13-swoole-alpine +8.2.13-s6-alpine +8.1.26-cli-alpine +8.1.26-fpm-alpine +8.1.26-unit-alpine +8.1.26-composer-alpine +8.1.26-swoole-alpine +8.1.26-s6-alpine 8.0.30-cli-alpine 8.0.30-fpm-alpine 8.0.30-unit-alpine diff --git a/dockerfile/php/tests/git/Dockerfile b/dockerfile/php/tests/git/Dockerfile index b0b411600..c5a4c5e04 100644 --- a/dockerfile/php/tests/git/Dockerfile +++ b/dockerfile/php/tests/git/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache git \ openssh-client \ diff --git a/dockerfile/sync/docker-image-sync.json b/dockerfile/sync/docker-image-sync.json index 233ae788d..f79208ff4 100644 --- a/dockerfile/sync/docker-image-sync.json +++ b/dockerfile/sync/docker-image-sync.json @@ -39,21 +39,21 @@ "source": "docker:test-dind-rootless", "dest": "library-mirror/docker:test-dind-rootless" }, - { - "source": "library/alpine:3.15", - "dest": "library-mirror/alpine:3.15" - }, { "source": "library/alpine:3.16", "dest": "library-mirror/alpine:3.16" }, { "source": "library/alpine:3.17", - "dest": "library-mirror/alpine:3.16" + "dest": "library-mirror/alpine:3.17" }, { "source": "library/alpine:3.18", - "dest": "library-mirror/alpine:3.16" + "dest": "library-mirror/alpine:3.18" + }, + { + "source": "library/alpine:3.19", + "dest": "library-mirror/alpine:3.19" }, { "source": "library/alpine:edge", diff --git a/docs/custom.md b/docs/custom.md index 94b04047f..642e4488d 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.10}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-fpm-alpine ``` 你也可以加上 `build` 字段，先构建镜像再启动 @@ -48,7 +48,7 @@ services: services: php8: - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.10}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-fpm-alpine # 增加 build 字段 build: context: ./dockerfile/php/ diff --git a/kubernetes/lnmp/php/base/lnmp-php.yaml b/kubernetes/lnmp/php/base/lnmp-php.yaml index 83f15495f..434218096 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.10-fpm-alpine + image: khs1994/php:8.2.13-fpm-alpine imagePullPolicy: IfNotPresent args: - php-fpm diff --git a/lrew/nginx-unit/docker-compose.yml b/lrew/nginx-unit/docker-compose.yml index e85ea4107..24ed71454 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.10}-unit-alpine" + image: "khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-unit-alpine" volumes: - ./config/${LNMP_NGINX_UNIT_CONF:-nginx-unit}:/etc/nginx-unit # ./path/unit-init-conf:/docker-entrypoint.d diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index 326123032..e84dc88e4 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.10-fpm-alpine + image: php:8.2.13-fpm-alpine composer: image: composer:2.5.8 diff --git a/vscode-remote/docker-workspace.yml b/vscode-remote/docker-workspace.yml index 54ce21e1e..e0b80d3d3 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.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine networks: - backend volumes: @@ -68,7 +68,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.10-composer-alpine" + image: "khs1994/php:8.2.13-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 d4c28c28c..4d6f90c33 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.10", + "pre-version": "8.2.13", "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.10" + "version": "8.2.13" } diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.yaml b/windows/lnmp-windows-pm-repo/php/lwpm.yaml index d6e4496a2..0897440a8 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.10" -pre-version: "8.2.10" +version: "8.2.13" +pre-version: "8.2.13" homepage: "https://www.php.net/" bug: "https://www.php.net/" github: "php/php-src" diff --git a/wsl/.env b/wsl/.env index 9c7463d5a..2973d0616 100644 --- a/wsl/.env +++ b/wsl/.env @@ -3,7 +3,7 @@ PHP_VERSION_72=7.2.34 PHP_VERSION_73=7.3.33 PHP_VERSION_74=7.4.33 PHP_VERSION_80=8.0.30 -PHP_VERSION_81=8.1.23 -PHP_VERSION_82=8.2.10 +PHP_VERSION_81=8.1.26 +PHP_VERSION_82=8.2.13 registry=docker.io diff --git a/wsl/Dockerfile b/wsl/Dockerfile index 549cdcdba..837711c2a 100755 --- a/wsl/Dockerfile +++ b/wsl/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim ################################################################################ -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG PHP_NUM=82 diff --git a/wsl/docker-compose.yml b/wsl/docker-compose.yml index 6b42b5bcd..b27a640f4 100755 --- a/wsl/docker-compose.yml +++ b/wsl/docker-compose.yml @@ -33,11 +33,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=debian:bullseye-slim # - DEB_URL=mirrors.ustc.edu.cn # - DEB_SECURITY_URL=mirrors.ustc.edu.cn/debian-security - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-debian-bullseye_amd64 wsl-php-builder-nightly: build: @@ -56,11 +56,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=debian:bookworm-slim - DEB_URL=mirrors.ustc.edu.cn - DEB_SECURITY_URL=mirrors.ustc.edu.cn/debian-security - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-debian-bookworm_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-debian-bookworm_amd64 # https://endoflife.software/operating-systems/linux/ubuntu # https://github.com/docker-library/docs/tree/master/ubuntu @@ -91,11 +91,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=ubuntu:18.04 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-ubuntu-bionic_amd64 wsl-php-builder-ubuntu2004-74: build: @@ -124,11 +124,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=ubuntu:20.04 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-ubuntu-focal_amd64 wsl-php-builder-ubuntu2204-74: build: @@ -157,11 +157,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=ubuntu:22.04 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-ubuntu-jammy_amd64 wsl-php-builder-ubuntu2204-nightly: build: @@ -180,11 +180,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=ubuntu:22.10 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-kinetic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-ubuntu-kinetic_amd64 # rhel @@ -219,9 +219,9 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-centos-8_amd64 wsl-php-builder-rhel9-74: build: @@ -246,9 +246,9 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-centos-9_amd64 # https://github.com/docker-library/docs/tree/master/rockylinux @@ -257,18 +257,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=rockylinux:8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-rocky-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-rocky-8_amd64 wsl-php-builder-rocky9-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=rockylinux:9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-rocky-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-rocky-9_amd64 # fedora # https://github.com/docker-library/docs/tree/master/fedora @@ -296,9 +296,9 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-fedora-36_amd64 wsl-php-builder-fc36-nightly: build: diff --git a/wsl/lnmp-wsl-builder-php b/wsl/lnmp-wsl-builder-php index cb3a38def..2b7af4306 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.10 +export PHP_LATEST_VERSION=8.2.13 ################################################################################ for command in "$@" diff --git a/wsl/lnmp-wsl-builder-php-rhel b/wsl/lnmp-wsl-builder-php-rhel index a83b19a16..cf1f3aec3 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.10 +export PHP_LATEST_VERSION=8.2.13 ################################################################################ # diff --git a/wsl/wsl.phpbuilder.Dockerfile b/wsl/wsl.phpbuilder.Dockerfile index 394efdc2e..50a772dea 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.10 +ARG PHP_VERSION=8.2.13 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 d747e9cfe..f315a62b8 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.10 +ARG PHP_VERSION=8.2.13 COPY lnmp-wsl-builder-php-rhel /lnmp-wsl-builder-php-rhel.sh