Sync from khs1994-docker/lnmp@40f666c by PCIT

khs1994-docker · Nov 23, 2024 · 8d6a2ff · 8d6a2ff
1 parent c2bde91
commit 8d6a2ff
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -34,7 +34,7 @@ steps:
   # install dep
   - name: install
     # image: composer:2.5.8
-    image: khs1994/php:8.3.0-composer-alpine
+    image: khs1994/php:8.3.12-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.3.0-fpm-alpine
+    image: khs1994/php:8.3.12-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.3.0-pro-${DRONE_TAG}-alpine
+      tags: 8.3.12-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.3.0-pro-${DRONE_TAG}-alpine
+      tags: 8.3.12-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.3.0-composer-alpine
+    image: khs1994/php:8.3.12-composer-alpine
     when:
       status: success
     commands:
@@ -228,8 +228,8 @@ volumes:
 #   COMPOSER_VERSION:
 #     - 2.5.8
 #   PHP_VERSION:
-#     - 8.3.0
-#     - 8.1.26
+#     - 8.3.12
+#     - 8.1.31
 #     - 8.0.30
 #     # - 7.4.33
 #     # - 7.3.33

diff --git a/.env.example b/.env.example
@@ -1,7 +1,7 @@
 DOCKER_HUB_USERNAME=khs1994
 
-PHP_VERSION=8.3.0
-# PHP_VERSION=8.1.26
+PHP_VERSION=8.3.12
+# PHP_VERSION=8.1.31
 # PHP_VERSION=8.0.30
 # PHP_VERSION=7.4.33
 # PHP_VERSION=7.3.33

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
   test:
     strategy:
       matrix:
-        php_version: ["8.0.30","8.1.26","8.2.13"]
+        php_version: ["8.0.30","8.1.31","8.2.26"]
     runs-on: ubuntu-latest
     # needs: job
     steps:

diff --git a/.pcit.yml b/.pcit.yml
@@ -16,7 +16,7 @@ steps:
   # install dep
   install:
     # image: composer:${COMPOSER_VERSION}
-    image: khs1994/php:8.3.0-composer-alpine
+    image: khs1994/php:8.3.12-composer-alpine
     shell: bash
     run:
       - pwd
@@ -80,7 +80,7 @@ steps:
       event: tag
 
   after_success:
-    image: khs1994/php:8.3.0-composer-alpine
+    image: khs1994/php:8.3.12-composer-alpine
     shell: bash
     if:
       status: success
@@ -129,8 +129,8 @@ jobs:
   COMPOSER_VERSION:
     - 2.5.8
   PHP_VERSION:
-    - 8.3.0
-    - 8.1.26
+    - 8.3.12
+    - 8.1.31
     - 8.0.30
     # - 7.4.33
     # - 7.3.33

diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@
 # !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !!
 
 ARG NODE_VERSION=20.5.1
-ARG PHP_VERSION=8.3.0
+ARG PHP_VERSION=8.3.12
 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.3.0-pro-GIT_TAG-alpine --target=php .
+# $ docker build -t khs1994/php:8.3.12-pro-GIT_TAG-alpine --target=php .
 
 FROM ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION}-fpm-alpine as php
 

diff --git a/deploy/test.Dockerfile b/deploy/test.Dockerfile
@@ -2,7 +2,7 @@
 # TEST PHP PROJECT BY Docker
 #
 
-ARG PHP_VERSION=8.3.0
+ARG PHP_VERSION=8.3.12
 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/docker-compose.yml b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       context: .
       dockerfile: deploy/test.Dockerfile
       args:
-        - PHP_VERSION=${PHP_VERSION:-8.3.0}
+        - PHP_VERSION=${PHP_VERSION:-8.3.12}
     image: ${DOCKER_HUB_USERNAME:-khs1994}/EXAMPLE
 
   nginx:
@@ -39,7 +39,7 @@ services:
       dockerfile: Dockerfile
       target: php
       args:
-        - PHP_VERSION=${PHP_VERSION:-8.3.0}
+        - PHP_VERSION=${PHP_VERSION:-8.3.12}
         - NODE_VERSION=${NODE_VERSION:-20.5.1}
         - NODE_REGISTRY=https://registry.npmmirror.com
-    image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.3.0}-pro-alpine
+    image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.3.12}-pro-alpine
diff --git a/docker-workspace.yml b/docker-workspace.yml
@@ -9,7 +9,7 @@ x-common:
 services:
   workspace:
     &workspace
-    image: khs1994/php:8.3.0-composer-alpine
+    image: khs1994/php:8.3.12-composer-alpine
     networks:
       - backend
     volumes:
@@ -67,7 +67,7 @@ services:
     << :
       - *workspace
       - *common
-    image: "khs1994/php:8.3.0-composer-alpine"
+    image: "khs1994/php:8.3.12-composer-alpine"
     command: [] # install | update
 
   npm: