Skip to content

Commit

Permalink
[PHP] update to v8.2.13 v8.1.26 v8.0.30
Browse files Browse the repository at this point in the history
Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>
  • Loading branch information
khs1994 committed Feb 11, 2024
1 parent f902880 commit 5505520
Show file tree
Hide file tree
Showing 67 changed files with 191 additions and 185 deletions.
8 changes: 4 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .env.example.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-php/.github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-php/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-php/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,57 +18,57 @@ 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
DIST_FILE: khs1994-wsl-php74-7.4.33-1.el8.centos.x86_64.rpm
- JOB_NAME: wsl-php-builder-rhel8-80
DIST_FILE: khs1994-wsl-php80-8.0.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
Expand Down
2 changes: 1 addition & 1 deletion .pcit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions README.cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
14 changes: 7 additions & 7 deletions app/demo/.drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/demo/.env.example
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/demo/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions app/demo/.pcit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/demo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion app/demo/deploy/test.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/demo/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
4 changes: 2 additions & 2 deletions app/demo/docker-workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions app/laravel-demo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions app/laravel-demo/Dockerfile.buildkit
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions app/laravel-demo/Dockerfile.cdn
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
Loading

0 comments on commit 5505520

Please sign in to comment.