Skip to content

Commit 8d6a2ff

Browse files
committed
Sync from khs1994-docker/lnmp@40f666c by PCIT
1 parent c2bde91 commit 8d6a2ff

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

.drone.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
# install dep
3535
- name: install
3636
# image: composer:2.5.8
37-
image: khs1994/php:8.3.0-composer-alpine
37+
image: khs1994/php:8.3.12-composer-alpine
3838
commands:
3939
- pwd
4040
- composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/
@@ -46,7 +46,7 @@ steps:
4646

4747
# test script
4848
- name: script
49-
image: khs1994/php:8.3.0-fpm-alpine
49+
image: khs1994/php:8.3.12-fpm-alpine
5050
# pull: always | never | if-not-exists
5151
# detach: true
5252
# privileged: true
@@ -92,7 +92,7 @@ steps:
9292
settings:
9393
# registry: docker.khs1994.com
9494
repo: khs1994/php
95-
tags: 8.3.0-pro-${DRONE_TAG}-alpine
95+
tags: 8.3.12-pro-${DRONE_TAG}-alpine
9696
target: php
9797
mirror: https://hub-mirror.c.163.com
9898
# build_args:
@@ -142,7 +142,7 @@ steps:
142142
image: plugins/docker
143143
settings:
144144
repo: khs1994/php
145-
tags: 8.3.0-pro-${DRONE_TAG}-alpine
145+
tags: 8.3.12-pro-${DRONE_TAG}-alpine
146146
target: php
147147
mirror: https://hub-mirror.c.163.com
148148
username:
@@ -179,7 +179,7 @@ steps:
179179
event: [ tag ]
180180

181181
- name: after_success
182-
image: khs1994/php:8.3.0-composer-alpine
182+
image: khs1994/php:8.3.12-composer-alpine
183183
when:
184184
status: success
185185
commands:
@@ -228,8 +228,8 @@ volumes:
228228
# COMPOSER_VERSION:
229229
# - 2.5.8
230230
# PHP_VERSION:
231-
# - 8.3.0
232-
# - 8.1.26
231+
# - 8.3.12
232+
# - 8.1.31
233233
# - 8.0.30
234234
# # - 7.4.33
235235
# # - 7.3.33

.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DOCKER_HUB_USERNAME=khs1994
22

3-
PHP_VERSION=8.3.0
4-
# PHP_VERSION=8.1.26
3+
PHP_VERSION=8.3.12
4+
# PHP_VERSION=8.1.31
55
# PHP_VERSION=8.0.30
66
# PHP_VERSION=7.4.33
77
# PHP_VERSION=7.3.33

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
test:
1717
strategy:
1818
matrix:
19-
php_version: ["8.0.30","8.1.26","8.2.13"]
19+
php_version: ["8.0.30","8.1.31","8.2.26"]
2020
runs-on: ubuntu-latest
2121
# needs: job
2222
steps:

.pcit.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ steps:
1616
# install dep
1717
install:
1818
# image: composer:${COMPOSER_VERSION}
19-
image: khs1994/php:8.3.0-composer-alpine
19+
image: khs1994/php:8.3.12-composer-alpine
2020
shell: bash
2121
run:
2222
- pwd
@@ -80,7 +80,7 @@ steps:
8080
event: tag
8181

8282
after_success:
83-
image: khs1994/php:8.3.0-composer-alpine
83+
image: khs1994/php:8.3.12-composer-alpine
8484
shell: bash
8585
if:
8686
status: success
@@ -129,8 +129,8 @@ jobs:
129129
COMPOSER_VERSION:
130130
- 2.5.8
131131
PHP_VERSION:
132-
- 8.3.0
133-
- 8.1.26
132+
- 8.3.12
133+
- 8.1.31
134134
- 8.0.30
135135
# - 7.4.33
136136
# - 7.3.33

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !!
1010

1111
ARG NODE_VERSION=20.5.1
12-
ARG PHP_VERSION=8.3.0
12+
ARG PHP_VERSION=8.3.12
1313
ARG NGINX_VERSION=1.15.0
1414
ARG DOCKER_HUB_USERNAME=khs1994
1515

@@ -28,7 +28,7 @@ RUN cd /app \
2828
--no-plugins
2929

3030
# 2.将项目打入 PHP 镜像
31-
# $ docker build -t khs1994/php:8.3.0-pro-GIT_TAG-alpine --target=php .
31+
# $ docker build -t khs1994/php:8.3.12-pro-GIT_TAG-alpine --target=php .
3232

3333
FROM ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION}-fpm-alpine as php
3434

deploy/test.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# TEST PHP PROJECT BY Docker
33
#
44

5-
ARG PHP_VERSION=8.3.0
5+
ARG PHP_VERSION=8.3.12
66
ARG GIT_REPO={{ EXAMPLE_GIT_URL_EXAMPLE }}/{{ EXAMPLE_GIT_USERNAME_EXAMPLE }}/{{ EXAMPLE_GIT_REPO_EXAMPLE }}.git
77

88
FROM khs1994/php:${PHP_VERSION}-composer-alpine

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
context: .
2020
dockerfile: deploy/test.Dockerfile
2121
args:
22-
- PHP_VERSION=${PHP_VERSION:-8.3.0}
22+
- PHP_VERSION=${PHP_VERSION:-8.3.12}
2323
image: ${DOCKER_HUB_USERNAME:-khs1994}/EXAMPLE
2424

2525
nginx:
@@ -39,7 +39,7 @@ services:
3939
dockerfile: Dockerfile
4040
target: php
4141
args:
42-
- PHP_VERSION=${PHP_VERSION:-8.3.0}
42+
- PHP_VERSION=${PHP_VERSION:-8.3.12}
4343
- NODE_VERSION=${NODE_VERSION:-20.5.1}
4444
- NODE_REGISTRY=https://registry.npmmirror.com
45-
image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.3.0}-pro-alpine
45+
image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.3.12}-pro-alpine

docker-workspace.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ x-common:
99
services:
1010
workspace:
1111
&workspace
12-
image: khs1994/php:8.3.0-composer-alpine
12+
image: khs1994/php:8.3.12-composer-alpine
1313
networks:
1414
- backend
1515
volumes:
@@ -67,7 +67,7 @@ services:
6767
<< :
6868
- *workspace
6969
- *common
70-
image: "khs1994/php:8.3.0-composer-alpine"
70+
image: "khs1994/php:8.3.12-composer-alpine"
7171
command: [] # install | update
7272

7373
npm:

0 commit comments

Comments
 (0)