diff --git a/.env.example b/.env.example index 75d829c19..7423f13f9 100644 --- a/.env.example +++ b/.env.example @@ -124,7 +124,7 @@ LNMP_NGINX_VERSION=1.21.3 LNMP_MYSQL_VERSION=8.0.29 -LNMP_PHP_VERSION=8.1.4 +LNMP_PHP_VERSION=8.1.5 # LNMP_PHP_VERSION=nightly # EOL @@ -137,9 +137,9 @@ LNMP_PHP72_VERSION=7.2.34 LNMP_PHP73_VERSION=7.3.33 # EOL LNMP_PHP74_VERSION=7.4.30 -LNMP_PHP8_VERSION=8.1.4 -LNMP_PHP80_VERSION=8.0.18 -LNMP_PHP81_VERSION=8.1.4 +LNMP_PHP8_VERSION=8.1.5 +LNMP_PHP80_VERSION=8.0.19 +LNMP_PHP81_VERSION=8.1.5 LNMP_PHP82_VERSION=8.2.0beta2 LNMP_REDIS_VERSION=7.0.0 diff --git a/.env.example.ps1 b/.env.example.ps1 index 4dd8afbb3..48878eb7a 100644 --- a/.env.example.ps1 +++ b/.env.example.ps1 @@ -7,7 +7,7 @@ $CI_HOST="ci.khs1994.com:1218" # $ wsl -l $DistributionName="Ubuntu-18.04" -$LNMP_PHP_IMAGE="khs1994/php:8.1.4-composer-alpine" +$LNMP_PHP_IMAGE="khs1994/php:8.1.5-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 ec48715d1..f70975956 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.1.4 - - 8.0.18 + - 8.1.5 + - 8.0.19 - 7.4.30 # EOL - 7.3.33 diff --git a/.github/actions/setup-php/action.yml b/.github/actions/setup-php/action.yml index f826ca0d0..22c420308 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.1.4" + default: "8.1.5" 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 6e5497bc8..c3edaa192 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.1.4' 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.1.5' 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 6cea68f68..76a0d34e9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,59 +16,59 @@ jobs: - JOB_NAME: wsl-php-builder-74 DIST_FILE: khs1994-wsl-php74_7.4.30-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-80 - DIST_FILE: khs1994-wsl-php80_8.0.18-debian-bullseye_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.19-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-81 - DIST_FILE: khs1994-wsl-php81_8.1.4-debian-bullseye_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.5-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-nightly DIST_FILE: khs1994-wsl-php82_0.0.0-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-debian12-81 - DIST_FILE: khs1994-wsl-php81_8.1.4-debian-bookworm_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.5-debian-bookworm_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu1804-74 DIST_FILE: khs1994-wsl-php74_7.4.30-ubuntu-bionic_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu1804-80 - DIST_FILE: khs1994-wsl-php80_8.0.18-ubuntu-bionic_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.19-ubuntu-bionic_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu1804-81 - DIST_FILE: khs1994-wsl-php81_8.1.4-ubuntu-bionic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.5-ubuntu-bionic_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2004-74 DIST_FILE: khs1994-wsl-php74_7.4.30-ubuntu-focal_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2004-80 - DIST_FILE: khs1994-wsl-php80_8.0.18-ubuntu-focal_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.19-ubuntu-focal_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2004-81 - DIST_FILE: khs1994-wsl-php81_8.1.4-ubuntu-focal_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.5-ubuntu-focal_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-74 DIST_FILE: khs1994-wsl-php74_7.4.30-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-80 - DIST_FILE: khs1994-wsl-php80_8.0.18-ubuntu-jammy_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.19-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-81 - DIST_FILE: khs1994-wsl-php81_8.1.4-ubuntu-jammy_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.5-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-nightly DIST_FILE: khs1994-wsl-php82_0.0.0-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2210-81 - DIST_FILE: khs1994-wsl-php81_8.1.4-ubuntu-kinetic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.5-ubuntu-kinetic_amd64.deb - JOB_NAME: wsl-php-builder-rhel7-74 DIST_FILE: khs1994-wsl-php74-7.4.30-1.el7.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel8-74 DIST_FILE: khs1994-wsl-php74-7.4.30-1.el8.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel8-80 - DIST_FILE: khs1994-wsl-php80-8.0.18-1.el8.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.19-1.el8.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel8-81 - DIST_FILE: khs1994-wsl-php81-8.1.4-1.el8.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.5-1.el8.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel9-74 DIST_FILE: khs1994-wsl-php74-7.4.30-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel9-80 - DIST_FILE: khs1994-wsl-php80-8.0.18-1.el9.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.19-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel9-81 - DIST_FILE: khs1994-wsl-php81-8.1.4-1.el9.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.5-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky8-81 - DIST_FILE: khs1994-wsl-php81-8.1.4-1.el8.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.5-1.el8.rocky.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky9-81 - DIST_FILE: khs1994-wsl-php81-8.1.4-1.el9.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.5-1.el9.rocky.x86_64.rpm - JOB_NAME: wsl-php-builder-fc36-74 DIST_FILE: khs1994-wsl-php74-7.4.30-1.fc36.x86_64.rpm - JOB_NAME: wsl-php-builder-fc36-80 - DIST_FILE: khs1994-wsl-php80-8.0.18-1.fc36.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.19-1.fc36.x86_64.rpm - JOB_NAME: wsl-php-builder-fc36-81 - DIST_FILE: khs1994-wsl-php81-8.1.4-1.fc36.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.5-1.fc36.x86_64.rpm - JOB_NAME: wsl-php-builder-fc36-nightly DIST_FILE: khs1994-wsl-php82-0.0.0-1.fc36.x86_64.rpm - JOB_NAME: wsl-php-builder-fc37-nightly diff --git a/.pcit.yml b/.pcit.yml index d1baad673..b69737634 100644 --- a/.pcit.yml +++ b/.pcit.yml @@ -4,7 +4,7 @@ workspace: steps: bash: - image: khs1994/php:8.1.4-composer-alpine + image: khs1994/php:8.1.5-composer-alpine run: - pwd - bash ./lnmp-docker diff --git a/CHANGELOG.md b/CHANGELOG.md index 0041541b5..5c1df8699 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,3 +11,5 @@ ### Changes: ### Updates: + +* [PHP `8.1.5` `8.0.19` `7.4.30`](https://www.php.net/ChangeLog-8.php#8.1.5) diff --git a/README.cn.md b/README.cn.md index 27efe7e71..13091b1d2 100644 --- a/README.cn.md +++ b/README.cn.md @@ -202,13 +202,13 @@ $ ./lnmp-docker down |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.21.3-alpine` | **1.21.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.1.4-unit-alpine`| **1.27.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.1.5-unit-alpine`| **1.27.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.29` | **8.0.29** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.8.3` | **10.8.3** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.1.4-fpm-alpine` | **8.1.4** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.1.4-composer-alpine`| **2.3.10** |`alpine:3.16` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.1.5-fpm-alpine` | **8.1.5** |`alpine:3.16` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.1.5-composer-alpine`| **2.3.10** |`alpine:3.16` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/README.md b/README.md index f79a6858d..2f469115a 100644 --- a/README.md +++ b/README.md @@ -197,13 +197,13 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#% |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.21.3-alpine` | **1.21.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.1.4-unit-alpine`| **1.27.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.1.5-unit-alpine`| **1.27.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.29` | **8.0.29** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.8.3` | **10.8.3** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.1.4-fpm-alpine` | **8.1.4** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.1.4-composer-alpine`| **2.3.10** |`alpine:3.16` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.1.5-fpm-alpine` | **8.1.5** |`alpine:3.16` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.1.5-composer-alpine`| **2.3.10** |`alpine:3.16` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/app/demo/.drone.yml b/app/demo/.drone.yml index fa0485532..1fa2d5fff 100644 --- a/app/demo/.drone.yml +++ b/app/demo/.drone.yml @@ -34,7 +34,7 @@ steps: # install dep - name: install # image: composer:2.3.10 - image: khs1994/php:8.1.4-composer-alpine + image: khs1994/php:8.1.5-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.1.4-fpm-alpine + image: khs1994/php:8.1.5-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.1.4-pro-${DRONE_TAG}-alpine + tags: 8.1.5-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.1.4-pro-${DRONE_TAG}-alpine + tags: 8.1.5-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.1.4-composer-alpine + image: khs1994/php:8.1.5-composer-alpine when: status: success commands: @@ -228,8 +228,8 @@ volumes: # COMPOSER_VERSION: # - 2.3.10 # PHP_VERSION: -# - 8.1.4 -# - 8.0.18 +# - 8.1.5 +# - 8.0.19 # - 7.4.30 # # - 7.3.33 # # - 7.2.34 diff --git a/app/demo/.env.example b/app/demo/.env.example index 04edec0dc..0c6d1d864 100644 --- a/app/demo/.env.example +++ b/app/demo/.env.example @@ -1,7 +1,7 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION=8.1.4 -# PHP_VERSION=8.0.18 +PHP_VERSION=8.1.5 +# PHP_VERSION=8.0.19 # PHP_VERSION=7.4.30 # PHP_VERSION=7.3.33 # PHP_VERSION=7.2.34 diff --git a/app/demo/.github/workflows/ci.yml b/app/demo/.github/workflows/ci.yml index a4ad5d23a..5c394e1d7 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: ["7.4.30","8.0.18","8.1.4"] + php_version: ["7.4.30","8.0.19","8.1.5"] runs-on: ubuntu-latest # needs: job steps: diff --git a/app/demo/.pcit.yml b/app/demo/.pcit.yml index a6a5ed929..19fff6a45 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.1.4-composer-alpine + image: khs1994/php:8.1.5-composer-alpine shell: bash run: - pwd @@ -80,7 +80,7 @@ steps: event: tag after_success: - image: khs1994/php:8.1.4-composer-alpine + image: khs1994/php:8.1.5-composer-alpine shell: bash if: status: success @@ -129,8 +129,8 @@ jobs: COMPOSER_VERSION: - 2.3.10 PHP_VERSION: - - 8.1.4 - - 8.0.18 + - 8.1.5 + - 8.0.19 - 7.4.30 # - 7.3.33 # - 7.2.34 diff --git a/app/demo/Dockerfile b/app/demo/Dockerfile index fe8e4506e..6c706a120 100644 --- a/app/demo/Dockerfile +++ b/app/demo/Dockerfile @@ -9,7 +9,7 @@ # !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !! ARG NODE_VERSION=18.2.0 -ARG PHP_VERSION=8.1.4 +ARG PHP_VERSION=8.1.5 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.1.4-pro-GIT_TAG-alpine --target=php . +# $ docker build -t khs1994/php:8.1.5-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 113dc9692..60c0ca8ec 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.1.4 +ARG PHP_VERSION=8.1.5 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 e63072aa0..38fc0244d 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.1.4} + - PHP_VERSION=${PHP_VERSION:-8.1.5} image: ${DOCKER_HUB_USERNAME:-khs1994}/EXAMPLE nginx: @@ -39,7 +39,7 @@ services: dockerfile: Dockerfile target: php args: - - PHP_VERSION=${PHP_VERSION:-8.1.4} + - PHP_VERSION=${PHP_VERSION:-8.1.5} - NODE_VERSION=${NODE_VERSION:-18.2.0} - NODE_REGISTRY=https://registry.npmmirror.com - image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.1.4}-pro-alpine + image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.1.5}-pro-alpine diff --git a/app/demo/docker-workspace.yml b/app/demo/docker-workspace.yml index 022f701af..a56a0f33b 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.1.4-composer-alpine + image: khs1994/php:8.1.5-composer-alpine networks: - backend volumes: @@ -66,7 +66,7 @@ services: composer: << : *workspace << : *common - image: "khs1994/php:8.1.4-composer-alpine" + image: "khs1994/php:8.1.5-composer-alpine" command: [] # install | update npm: diff --git a/app/laravel-demo/Dockerfile b/app/laravel-demo/Dockerfile index 9a7e14098..8b347684d 100644 --- a/app/laravel-demo/Dockerfile +++ b/app/laravel-demo/Dockerfile @@ -14,7 +14,7 @@ # $ docker build --target=laravel -t khs1994/laravel:7 --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=18.2.0 -ARG PHP_VERSION=8.1.4 +ARG PHP_VERSION=8.1.5 ARG NGINX_VERSION=1.21.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 @@ -43,7 +43,7 @@ RUN set -x ; cd /app \ && npm run production # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.1.4-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.1.5-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 8f80b660e..205b40186 100644 --- a/app/laravel-demo/Dockerfile.buildkit +++ b/app/laravel-demo/Dockerfile.buildkit @@ -16,7 +16,7 @@ # $ docker buildx build --target=laravel --load -t khs1994/laravel:7 -f Dockerfile.buildkit --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=18.2.0 -ARG PHP_VERSION=8.1.4 +ARG PHP_VERSION=8.1.5 ARG NGINX_VERSION=1.21.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 @@ -50,7 +50,7 @@ RUN --mount=type=cache,target=/app/node_modules,id=laravel-docker_node_modules \ && npm run production # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.1.4-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.1.5-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 af92ed88e..b6bc19ee8 100644 --- a/app/laravel-demo/Dockerfile.cdn +++ b/app/laravel-demo/Dockerfile.cdn @@ -15,7 +15,7 @@ # # $ docker buildx build --target=laravel --load -t khs1994/laravel:7 -f Dockerfile.cdn --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . -ARG PHP_VERSION=8.1.4 +ARG PHP_VERSION=8.1.5 ARG NGINX_VERSION=1.21.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 @@ -75,7 +75,7 @@ RUN set -x \ && mc --insecure policy set public minio/${CDN_BUCKET} # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.1.4-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.1.5-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 fa18cdc80..cdf3c3fba 100644 --- a/docker-lnmp.override.example.yml +++ b/docker-lnmp.override.example.yml @@ -28,11 +28,11 @@ services: # php8: # &php8 # # ! change php8 default image - # image: username/php:${LNMP_PHP8_VERSION:-8.1.4}-fpm-alpine + # image: username/php:${LNMP_PHP8_VERSION:-8.1.5}-fpm-alpine # # ! cn mirror image - # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.1.4}-fpm-alpine + # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.1.5}-fpm-alpine # # ! s6 - # # image: khs1994/php:${LNMP_PHP8_VERSION:-8.1.4}-s6-alpine + # # image: khs1994/php:${LNMP_PHP8_VERSION:-8.1.5}-s6-alpine # # command: [] # # ! open more port # ports: @@ -75,7 +75,7 @@ services: swoole: << : *common - image: khs1994/php:${LNMP_PHP_VERSION:-8.1.4}-swoole-alpine + image: khs1994/php:${LNMP_PHP_VERSION:-8.1.5}-swoole-alpine # command 指令只需传入文件名即可 command: - /app/swoole/index.php diff --git a/docker-lnmp.yml b/docker-lnmp.yml index c2d6ad4da..e21be2ab0 100644 --- a/docker-lnmp.yml +++ b/docker-lnmp.yml @@ -175,7 +175,7 @@ services: &php8 << : *common << : *common-labels - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.1.4}-fpm-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.1.5}-fpm-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} @@ -227,7 +227,7 @@ services: << : *common << : *common-labels restart: "no" - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.1.4}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.1.5}-composer-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} diff --git a/docker-production.yml b/docker-production.yml index 3dad9d721..f75a30991 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.1.4-fpm-alpine + image: khs1994/php:8.1.5-fpm-alpine volumes: - ./app:/app - type: volume @@ -364,7 +364,7 @@ services: << : *common << : *default-labels << : *default-php - # image: khs1994/php:8.1.4-s6-alpine + # image: khs1994/php:8.1.5-s6-alpine # entrypoint: # - /s6-init build: diff --git a/docker-workspace.example.yml b/docker-workspace.example.yml index bc66a3cb3..b8cde1c23 100644 --- a/docker-workspace.example.yml +++ b/docker-workspace.example.yml @@ -13,7 +13,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:${LNMP_PHP_VERSION:-8.1.4}-composer-alpine + image: khs1994/php:${LNMP_PHP_VERSION:-8.1.5}-composer-alpine networks: - backend volumes: @@ -72,7 +72,7 @@ services: composer: << : *workspace << : *common - image: "khs1994/php:${LNMP_PHP_VERSION:-8.1.4}-composer-alpine" + image: "khs1994/php:${LNMP_PHP_VERSION:-8.1.5}-composer-alpine" command: [] # install | update npm: diff --git a/dockerfile/php/.env.example b/dockerfile/php/.env.example index e687d515e..8f0ee0293 100644 --- a/dockerfile/php/.env.example +++ b/dockerfile/php/.env.example @@ -1,7 +1,7 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION_81=8.1.4 -PHP_VERSION_80=8.0.18 +PHP_VERSION_81=8.1.5 +PHP_VERSION_80=8.0.19 PHP_VERSION_74=7.4.30 PHP_VERSION_82=8.2.0beta2 # EOL diff --git a/dockerfile/php/.github/workflows/php_8_0.yml b/dockerfile/php/.github/workflows/php_8_0.yml index 2abf13f95..e3e6dc430 100644 --- a/dockerfile/php/.github/workflows/php_8_0.yml +++ b/dockerfile/php/.github/workflows/php_8_0.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.0.18" + default: "8.0.19" name: PHP_8.0 @@ -201,7 +201,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_0_X FOLDER: "8.0" - PHP_TAG_VERSION: "8.0.18" + PHP_TAG_VERSION: "8.0.19" 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_1.yml b/dockerfile/php/.github/workflows/php_8_1.yml index a7375769f..02863ef70 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.4" + default: "8.1.5" name: PHP_8.1 @@ -294,7 +294,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_1_X FOLDER: "8.1" - PHP_TAG_VERSION: "8.1.4" + PHP_TAG_VERSION: "8.1.5" 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.0/cli/Dockerfile b/dockerfile/php/8.0/cli/Dockerfile index cd2ca76a8..2a0ce5527 100644 --- a/dockerfile/php/8.0/cli/Dockerfile +++ b/dockerfile/php/8.0/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.18 +ARG PHP_VERSION=8.0.19 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream @@ -10,7 +10,7 @@ LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.0.18 +ARG PHP_VERSION=8.0.19 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.0/composer/Dockerfile b/dockerfile/php/8.0/composer/Dockerfile index ca14b8ad1..fc2ed2ee0 100644 --- a/dockerfile/php/8.0/composer/Dockerfile +++ b/dockerfile/php/8.0/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.18 +ARG PHP_VERSION=8.0.19 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.0/fpm/Dockerfile b/dockerfile/php/8.0/fpm/Dockerfile index c823dd107..6058c1821 100644 --- a/dockerfile/php/8.0/fpm/Dockerfile +++ b/dockerfile/php/8.0/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.18 +ARG PHP_VERSION=8.0.19 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.15 as php diff --git a/dockerfile/php/8.0/s6/Dockerfile b/dockerfile/php/8.0/s6/Dockerfile index 49e3771e5..321d3d387 100644 --- a/dockerfile/php/8.0/s6/Dockerfile +++ b/dockerfile/php/8.0/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.18 +ARG PHP_VERSION=8.0.19 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.0/swoole/Dockerfile b/dockerfile/php/8.0/swoole/Dockerfile index a41b42c48..fea14ce35 100644 --- a/dockerfile/php/8.0/swoole/Dockerfile +++ b/dockerfile/php/8.0/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.18 +ARG PHP_VERSION=8.0.19 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=v5.0.0 ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.0.18-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.0.19-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.0/unit/Dockerfile b/dockerfile/php/8.0/unit/Dockerfile index 4991b7039..985d04e8f 100644 --- a/dockerfile/php/8.0/unit/Dockerfile +++ b/dockerfile/php/8.0/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.18 +ARG PHP_VERSION=8.0.19 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/8.1/cli/Dockerfile b/dockerfile/php/8.1/cli/Dockerfile index 9563655c0..d1c37e830 100644 --- a/dockerfile/php/8.1/cli/Dockerfile +++ b/dockerfile/php/8.1/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.4 +ARG PHP_VERSION=8.1.5 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream @@ -10,7 +10,7 @@ LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.1.4 +ARG PHP_VERSION=8.1.5 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.1/composer/Dockerfile b/dockerfile/php/8.1/composer/Dockerfile index 738a20744..9ff8c29aa 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.4 +ARG PHP_VERSION=8.1.5 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.1/fpm/Dockerfile b/dockerfile/php/8.1/fpm/Dockerfile index ce24b7e43..ac594719e 100644 --- a/dockerfile/php/8.1/fpm/Dockerfile +++ b/dockerfile/php/8.1/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.4 +ARG PHP_VERSION=8.1.5 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.15 as php diff --git a/dockerfile/php/8.1/s6/Dockerfile b/dockerfile/php/8.1/s6/Dockerfile index ce7d2973c..eb876c11a 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.4 +ARG PHP_VERSION=8.1.5 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.1/swoole/Dockerfile b/dockerfile/php/8.1/swoole/Dockerfile index e71c3e251..9f2312346 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.4 +ARG PHP_VERSION=8.1.5 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=v5.0.0 ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.1.4-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.1.5-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 db8e66c64..49be4a664 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.4 +ARG PHP_VERSION=8.1.5 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/README.md b/dockerfile/php/README.md index a43eece67..e3c4e582c 100644 --- a/dockerfile/php/README.md +++ b/dockerfile/php/README.md @@ -14,26 +14,26 @@ ## 后缀 -* 8.1.4-cli-alpine -* 8.1.4-fpm-alpine -* 8.1.4-unit-alpine (based cli) -* 8.1.4-composer-alpine (based fpm) -* 8.1.4-swoole-alpine (based cli) -* 8.1.4-s6-alpine (based fpm) +* 8.1.5-cli-alpine +* 8.1.5-fpm-alpine +* 8.1.5-unit-alpine (based cli) +* 8.1.5-composer-alpine (based fpm) +* 8.1.5-swoole-alpine (based cli) +* 8.1.5-s6-alpine (based fpm) ## Supported tags and respective `Dockerfile` links -* [`8.1.4-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.1.4/8.1/fpm/Dockerfile) +* [`8.1.5-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.1.5/8.1/fpm/Dockerfile) -* [`8.0.18-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.1.4/8.0/fpm/Dockerfile) +* [`8.0.19-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.1.5/8.0/fpm/Dockerfile) -* [`7.4.30-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.1.4/7.4/fpm/Dockerfile) +* [`7.4.30-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.1.5/7.4/fpm/Dockerfile) * [`nightly-fpm-alpine` (nightly/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/master/nightly/fpm/Dockerfile) -* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.1.4/7.3/fpm/Dockerfile) +* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.1.5/7.3/fpm/Dockerfile) -* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.1.4/7.2/fpm/Dockerfile) +* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.1.5/7.2/fpm/Dockerfile) ## Overview @@ -166,7 +166,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.30-1+deb11u1/debian/control/ -* https://sources.debian.org/src/php8.1/8.1.4-1/debian/control/ +* https://sources.debian.org/src/php8.1/8.1.5-1/debian/control/ * https://ram.tianon.xyz/post/2017/12/26/dockerize-compiled-software.html diff --git a/dockerfile/php/doctum/Dockerfile b/dockerfile/php/doctum/Dockerfile index f08718c73..e46cc620b 100644 --- a/dockerfile/php/doctum/Dockerfile +++ b/dockerfile/php/doctum/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.18 +ARG PHP_VERSION=8.0.19 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/php-cs-fixer/Dockerfile b/dockerfile/php/php-cs-fixer/Dockerfile index 1feb10330..48137a85e 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.4 +ARG PHP_VERSION=8.1.5 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/phpmd/Dockerfile b/dockerfile/php/phpmd/Dockerfile index 9a4270a8c..eeaa0fd84 100644 --- a/dockerfile/php/phpmd/Dockerfile +++ b/dockerfile/php/phpmd/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.18 +ARG PHP_VERSION=8.0.19 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/sync/docker-image-sync.json b/dockerfile/php/sync/docker-image-sync.json index b60602428..5ec109401 100644 --- a/dockerfile/php/sync/docker-image-sync.json +++ b/dockerfile/php/sync/docker-image-sync.json @@ -18,40 +18,40 @@ "source": "php:8.2.0beta2-s6-alpine" }, { - "source": "php:8.1.4-cli-alpine" + "source": "php:8.1.5-cli-alpine" }, { - "source": "php:8.1.4-fpm-alpine" + "source": "php:8.1.5-fpm-alpine" }, { - "source": "php:8.1.4-unit-alpine" + "source": "php:8.1.5-unit-alpine" }, { - "source": "php:8.1.4-composer-alpine" + "source": "php:8.1.5-composer-alpine" }, { - "source": "php:8.1.4-swoole-alpine" + "source": "php:8.1.5-swoole-alpine" }, { - "source": "php:8.1.4-s6-alpine" + "source": "php:8.1.5-s6-alpine" }, { - "source": "php:8.0.18-cli-alpine" + "source": "php:8.0.19-cli-alpine" }, { - "source": "php:8.0.18-fpm-alpine" + "source": "php:8.0.19-fpm-alpine" }, { - "source": "php:8.0.18-unit-alpine" + "source": "php:8.0.19-unit-alpine" }, { - "source": "php:8.0.18-composer-alpine" + "source": "php:8.0.19-composer-alpine" }, { - "source": "php:8.0.18-swoole-alpine" + "source": "php:8.0.19-swoole-alpine" }, { - "source": "php:8.0.18-s6-alpine" + "source": "php:8.0.19-s6-alpine" }, { "source": "php:7.4.30-cli-alpine" diff --git a/dockerfile/php/sync/manifest.txt b/dockerfile/php/sync/manifest.txt index d3f353797..f695bd9e9 100644 --- a/dockerfile/php/sync/manifest.txt +++ b/dockerfile/php/sync/manifest.txt @@ -1,15 +1,15 @@ -8.1.4-cli-alpine -8.1.4-fpm-alpine -8.1.4-unit-alpine -8.1.4-composer-alpine -8.1.4-swoole-alpine -8.1.4-s6-alpine -8.0.18-cli-alpine -8.0.18-fpm-alpine -8.0.18-unit-alpine -8.0.18-composer-alpine -8.0.18-swoole-alpine -8.0.18-s6-alpine +8.1.5-cli-alpine +8.1.5-fpm-alpine +8.1.5-unit-alpine +8.1.5-composer-alpine +8.1.5-swoole-alpine +8.1.5-s6-alpine +8.0.19-cli-alpine +8.0.19-fpm-alpine +8.0.19-unit-alpine +8.0.19-composer-alpine +8.0.19-swoole-alpine +8.0.19-s6-alpine 7.4.30-cli-alpine 7.4.30-fpm-alpine 7.4.30-unit-alpine diff --git a/docs/composer/README.md b/docs/composer/README.md index 70488a663..38a1046bd 100644 --- a/docs/composer/README.md +++ b/docs/composer/README.md @@ -38,5 +38,5 @@ $ composer config -g --unset repos.packagist ```powershell $MIRROR="mirrors.aliyun.com/composer/" -docker run -it --rm khs1994/php:8.1.4-composer-alpine sh -cx "composer config -g repos.packagist composer https://$MIRROR ; composer require laravel/laravel" +docker run -it --rm khs1994/php:8.1.5-composer-alpine sh -cx "composer config -g repos.packagist composer https://$MIRROR ; composer require laravel/laravel" ``` diff --git a/docs/custom.md b/docs/custom.md index 111961607..927123b37 100644 --- a/docs/custom.md +++ b/docs/custom.md @@ -37,7 +37,7 @@ version: "3.9" services: php8: # 想修改哪个配置在这里重写即可,例如想使用自己的 PHP 镜像或国内镜像,那么增加 `image` 指令即可 - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.1.4}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.1.5}-fpm-alpine ``` 你也可以加上 `build` 字段,先构建镜像再启动 @@ -48,7 +48,7 @@ version: "3.9" services: php8: - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.1.4}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.1.5}-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 fe6f9e840..4c717ec90 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.1.4-fpm-alpine + image: khs1994/php:8.1.5-fpm-alpine imagePullPolicy: IfNotPresent args: - php-fpm diff --git a/lrew/nginx-unit/docker-compose.yml b/lrew/nginx-unit/docker-compose.yml index c8b3c43ee..80b189c30 100644 --- a/lrew/nginx-unit/docker-compose.yml +++ b/lrew/nginx-unit/docker-compose.yml @@ -19,7 +19,7 @@ services: nginx-unit: << : *common << : *common-label - image: "khs1994/php:${LNMP_PHP_VERSION:-8.1.4}-unit-alpine" + image: "khs1994/php:${LNMP_PHP_VERSION:-8.1.5}-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 ec7d85bcf..c708aba1b 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -14,7 +14,7 @@ services: image: memcached:1.6.15-alpine php: - image: php:8.1.4-fpm-alpine + image: php:8.1.5-fpm-alpine composer: image: composer:2.3.10 diff --git a/vscode-remote/docker-workspace.yml b/vscode-remote/docker-workspace.yml index 09c7537b4..e9410cdb3 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.1.4-composer-alpine + image: khs1994/php:8.1.5-composer-alpine networks: - backend volumes: @@ -67,7 +67,7 @@ services: composer: << : *workspace << : *common - image: "khs1994/php:8.1.4-composer-alpine" + image: "khs1994/php:8.1.5-composer-alpine" command: [] # install | update npm: diff --git a/windows/docker-windows.yml b/windows/docker-windows.yml index dbe7cec27..2824487fa 100644 --- a/windows/docker-windows.yml +++ b/windows/docker-windows.yml @@ -14,7 +14,7 @@ services: isolation: hyperv mysql: - image: khs1994/mysql:8.0.18-windowsservercore-1903 + image: khs1994/mysql:8.0.19-windowsservercore-1903 isolation: process # hyperv ports: - "3306:3306" diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.json b/windows/lnmp-windows-pm-repo/php/lwpm.json index 5de83f23c..d283f5cac 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php/lwpm.json @@ -26,5 +26,5 @@ "uninstall": "if($isPre -eq 1){_cleanup \"C:\\php-pre\"}else{_cleanup \"C:\\php\"}\n", "version": "(php -v).split(\" \")[1]" }, - "version": "8.1.4" + "version": "8.1.5" } diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.yaml b/windows/lnmp-windows-pm-repo/php/lwpm.yaml index cca878943..e58231017 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php/lwpm.yaml @@ -1,6 +1,6 @@ name: "php" description: "PHP is a popular general-purpose scripting language that is especially suited to web development" -version: "8.1.4" +version: "8.1.5" pre-version: "8.2.0beta2" homepage: "https://www.php.net/" bug: "https://www.php.net/" diff --git a/wsl/.env b/wsl/.env index c6714f32e..1945da77c 100644 --- a/wsl/.env +++ b/wsl/.env @@ -2,7 +2,7 @@ PHP_VERSION_71=7.1.33 PHP_VERSION_72=7.2.34 PHP_VERSION_73=7.3.33 PHP_VERSION_74=7.4.30 -PHP_VERSION_80=8.0.18 -PHP_VERSION_81=8.1.4 +PHP_VERSION_80=8.0.19 +PHP_VERSION_81=8.1.5 registry=docker.io diff --git a/wsl/Dockerfile b/wsl/Dockerfile index 85b40ba22..e76bf5915 100755 --- a/wsl/Dockerfile +++ b/wsl/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim ################################################################################ -ARG PHP_VERSION=8.1.4 +ARG PHP_VERSION=8.1.5 ARG PHP_NUM=74 diff --git a/wsl/docker-compose.yml b/wsl/docker-compose.yml index d5750e851..2d0b0bd82 100755 --- a/wsl/docker-compose.yml +++ b/wsl/docker-compose.yml @@ -24,22 +24,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.18} + - PHP_VERSION=${PHP_VERSION_80:-8.0.19} - 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-php80_${PHP_VERSION_80:-8.0.18}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.19}-debian-bullseye_amd64 wsl-php-builder-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.4} + - PHP_VERSION=${PHP_VERSION_81:-8.1.5} - 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.4}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.5}-debian-bullseye_amd64 wsl-php-builder-nightly: build: @@ -58,11 +58,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.4} + - PHP_VERSION=${PHP_VERSION_81:-8.1.5} - 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.4}-debian-bookworm_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.5}-debian-bookworm_amd64 # https://endoflife.software/operating-systems/linux/ubuntu # https://github.com/docker-library/docs/tree/master/ubuntu @@ -82,22 +82,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.18} + - PHP_VERSION=${PHP_VERSION_80:-8.0.19} - 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-php80_${PHP_VERSION_80:-8.0.18}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.19}-ubuntu-bionic_amd64 wsl-php-builder-ubuntu1804-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.4} + - PHP_VERSION=${PHP_VERSION_81:-8.1.5} - 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.4}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.5}-ubuntu-bionic_amd64 wsl-php-builder-ubuntu2004-74: build: @@ -115,22 +115,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.18} + - PHP_VERSION=${PHP_VERSION_80:-8.0.19} - 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-php80_${PHP_VERSION_80:-8.0.18}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.19}-ubuntu-focal_amd64 wsl-php-builder-ubuntu2004-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.4} + - PHP_VERSION=${PHP_VERSION_81:-8.1.5} - 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.4}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.5}-ubuntu-focal_amd64 wsl-php-builder-ubuntu2204-74: build: @@ -148,22 +148,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.18} + - PHP_VERSION=${PHP_VERSION_80:-8.0.19} - 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-php80_${PHP_VERSION_80:-8.0.18}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.19}-ubuntu-jammy_amd64 wsl-php-builder-ubuntu2204-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.4} + - PHP_VERSION=${PHP_VERSION_81:-8.1.5} - 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.4}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.5}-ubuntu-jammy_amd64 wsl-php-builder-ubuntu2204-nightly: build: @@ -182,11 +182,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.4} + - PHP_VERSION=${PHP_VERSION_81:-8.1.5} - 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.4}-ubuntu-kinetic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.5}-ubuntu-kinetic_amd64 # rhel @@ -212,18 +212,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.18} + - PHP_VERSION=${PHP_VERSION_80:-8.0.19} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.18}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.19}-centos-8_amd64 wsl-php-builder-rhel8-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.4} + - PHP_VERSION=${PHP_VERSION_81:-8.1.5} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.4}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.5}-centos-8_amd64 wsl-php-builder-rhel9-74: build: @@ -239,18 +239,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.18} + - PHP_VERSION=${PHP_VERSION_80:-8.0.19} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.18}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.19}-centos-9_amd64 wsl-php-builder-rhel9-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.4} + - PHP_VERSION=${PHP_VERSION_81:-8.1.5} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.4}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.5}-centos-9_amd64 # https://github.com/docker-library/docs/tree/master/rockylinux @@ -259,18 +259,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.4} + - PHP_VERSION=${PHP_VERSION_81:-8.1.5} - OS_TYPE=rockylinux:8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.4}-rocky-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.5}-rocky-8_amd64 wsl-php-builder-rocky9-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.4} + - PHP_VERSION=${PHP_VERSION_81:-8.1.5} - OS_TYPE=rockylinux:9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.4}-rocky-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.5}-rocky-9_amd64 # fedora # https://github.com/docker-library/docs/tree/master/fedora @@ -289,18 +289,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.18} + - PHP_VERSION=${PHP_VERSION_80:-8.0.19} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.18}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.19}-fedora-36_amd64 wsl-php-builder-fc36-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.4} + - PHP_VERSION=${PHP_VERSION_81:-8.1.5} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.4}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.5}-fedora-36_amd64 wsl-php-builder-fc36-nightly: build: diff --git a/wsl/lnmp-wsl-builder-php b/wsl/lnmp-wsl-builder-php index 739757dfc..77c9c378a 100755 --- a/wsl/lnmp-wsl-builder-php +++ b/wsl/lnmp-wsl-builder-php @@ -1071,8 +1071,8 @@ command -v wget > /dev/null || $(_sudo) apt install wget -y mkdir -p /tmp/php-builder -test "$PHP_VERSION" = 'apt' && PHP_VERSION=8.1.4 -test "$PHP_VERSION" = 'apt-dev' && PHP_VERSION=8.1.4 +test "$PHP_VERSION" = 'apt' && PHP_VERSION=8.1.5 +test "$PHP_VERSION" = 'apt-dev' && PHP_VERSION=8.1.5 _get_phpnum $PHP_VERSION diff --git a/wsl/lnmp-wsl-builder-php-rhel b/wsl/lnmp-wsl-builder-php-rhel index dc446f236..dbc6dc1e0 100755 --- a/wsl/lnmp-wsl-builder-php-rhel +++ b/wsl/lnmp-wsl-builder-php-rhel @@ -1021,10 +1021,10 @@ command -v wget > /dev/null || $(_sudo) yum install -y wget mkdir -p /tmp/php-builder if [ "$PHP_VERSION" = 'rpm' -o "$PHP_VERSION" = 'yum' -o "$PHP_VERSION" = 'dnf' ];then \ - PHP_VERSION=8.1.4 ; fi + PHP_VERSION=8.1.5 ; fi if [ "$PHP_VERSION" = 'rpm-devel' -o "$PHP_VERSION" = 'yum-devel' -o "$PHP_VERSION" = 'dnf-devel' ];then \ - PHP_VERSION=8.1.4 ; fi + PHP_VERSION=8.1.5 ; fi _get_phpnum $PHP_VERSION diff --git a/wsl/lnmp-wsl-install b/wsl/lnmp-wsl-install index d83221c83..fc30c11dc 100755 --- a/wsl/lnmp-wsl-install +++ b/wsl/lnmp-wsl-install @@ -4,6 +4,10 @@ ScriptRoot="$( cd "$( dirname "$0" )" && pwd )" +source $ScriptRoot/../.env.example + +PHP_LATEST_STABLE_VERSION=${LNMP_PHP81_VERSION} + _print_help_info(){ exec echo " @@ -12,7 +16,7 @@ Install WSL soft by shell script Usage: -$ lnmp-wsl-install php 8.1.0 [ tar | deb | rpm ] +$ lnmp-wsl-install php ${PHP_LATEST_STABLE_VERSION} [ tar | deb | rpm ] $ lnmp-wsl-install enable [ php81 | php80 | php74 | php73 | php72 | php71 | php70 | php56 ] @@ -24,13 +28,13 @@ $ lnmp-wsl-install php-extension-list Example: -$ lnmp-wsl-install php 8.1.0 tar +$ lnmp-wsl-install php ${PHP_LATEST_STABLE_VERSION} tar -$ lnmp-wsl-install php 8.1.0 deb +$ lnmp-wsl-install php ${PHP_LATEST_STABLE_VERSION} deb -$ lnmp-wsl-install php 8.1.0 rpm +$ lnmp-wsl-install php ${PHP_LATEST_STABLE_VERSION} rpm -$ lnmp-wsl-install php 8.1.0 [8.1.4] [8.0.18] [7.4.30] [7.3.33] [7.2.34] [7.1.33] [7.0.33] [5.6.40] +$ lnmp-wsl-install php ${PHP_LATEST_STABLE_VERSION} [${LNMP_PHP80_VERSION}] [${LNMP_PHP74_VERSION}] [${LNMP_PHP73_VERSION}] [${LNMP_PHP72_VERSION}] [${LNMP_PHP71_VERSION}] [${LNMP_PHP70_VERSION}] [${LNMP_PHP56_VERSION}] $ REGISTRY_MIRROR=mirror.baidubce.com lnmp-wsl-install php nightly @@ -59,7 +63,7 @@ NODE_VERSION=18.2.0 NODE_PREFIX=/usr/local -PHP_VERSION=8.1.4 +PHP_VERSION=${PHP_LATEST_STABLE_VERSION} MYSQL_DEB_VERSION=0.8.13-1 @@ -107,9 +111,9 @@ _nginx(){ _php(){ # include redis memcached - # default install latest php version (8.1.4) + # default install latest php version (8.1.5) - PHP_VERSION=${1:-8.1.4} + PHP_VERSION=${1:-${PHP_LATEST_STABLE_VERSION}} case ${PHP_VERSION} in 5.6.* ) diff --git a/wsl/wsl.phpbuilder.Dockerfile b/wsl/wsl.phpbuilder.Dockerfile index 25425eb1b..03fc2bdaa 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.1.4 +ARG PHP_VERSION=8.1.5 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 64f5fd4f0..bc510d85d 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.1.4 +ARG PHP_VERSION=8.1.5 COPY lnmp-wsl-builder-php-rhel /lnmp-wsl-builder-php-rhel.sh