From 537f178fa50427ddebc6a52553331c271fa6aa06 Mon Sep 17 00:00:00 2001 From: augushong Date: Fri, 1 May 2026 20:45:04 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E6=9B=B4=E6=96=B0=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BB=A5=E6=94=AF=E6=8C=81=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=88=86=E5=8F=91=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将工作流容器镜像更换为包含 PHP 和 Composer 的专用镜像 - 在工作流中添加 Composer 依赖安装步骤，配置私有镜像源 - 修改所有 docker-compose.yaml 文件，将卷映射从多个子目录改为映射整个项目根目录，简化部署步骤 --- .gitea/workflows/build-and-deploy.yml | 6 +++++- docker-compose.yaml | 9 +++++---- source/stack/base-build/docker-compose.yaml | 9 +++++---- .../stack/default/.gitea/workflows/build-and-deploy.yml | 6 +++++- source/stack/default/docker-compose.yaml | 9 +++++---- source/stack/full/docker-compose.yaml | 9 +++++---- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 005335d..994533a 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -15,7 +15,7 @@ jobs: name: 直传代码并部署到 Host15 runs-on: main container: - image: catthehacker/ubuntu:act-latest + image: ulthon/debian-php82-composer steps: - name: Checkout uses: actions/checkout@v4 @@ -57,6 +57,10 @@ jobs: PACKAGE_NAME: ${{ env.PACKAGE_NAME }} run: | set -euo pipefail + + composer config -g repos.packagist composer https://nexus.hl7.top:1243/repository/composer-proxy/ + composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader + TMP_PACKAGE="/tmp/${PACKAGE_NAME}" rm -f "$TMP_PACKAGE" "$PACKAGE_NAME" diff --git a/docker-compose.yaml b/docker-compose.yaml index 91c3d0c..8de07f5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,7 +13,8 @@ services: ports: - "88:80" # HTTP volumes: - - ./runtime:/var/www/html/runtime - - ./public/storage:/var/www/html/public/storage - - ./public/build:/var/www/html/public/build - - ./storage:/var/www/html/storage + - ./:/var/www/html # 直接分发代码可以去掉注释并将下面的目录增加注释 + # - ./runtime:/var/www/html/runtime + # - ./public/storage:/var/www/html/public/storage + # - ./public/build:/var/www/html/public/build + # - ./storage:/var/www/html/storage diff --git a/source/stack/base-build/docker-compose.yaml b/source/stack/base-build/docker-compose.yaml index 91c3d0c..8de07f5 100644 --- a/source/stack/base-build/docker-compose.yaml +++ b/source/stack/base-build/docker-compose.yaml @@ -13,7 +13,8 @@ services: ports: - "88:80" # HTTP volumes: - - ./runtime:/var/www/html/runtime - - ./public/storage:/var/www/html/public/storage - - ./public/build:/var/www/html/public/build - - ./storage:/var/www/html/storage + - ./:/var/www/html # 直接分发代码可以去掉注释并将下面的目录增加注释 + # - ./runtime:/var/www/html/runtime + # - ./public/storage:/var/www/html/public/storage + # - ./public/build:/var/www/html/public/build + # - ./storage:/var/www/html/storage diff --git a/source/stack/default/.gitea/workflows/build-and-deploy.yml b/source/stack/default/.gitea/workflows/build-and-deploy.yml index 005335d..994533a 100644 --- a/source/stack/default/.gitea/workflows/build-and-deploy.yml +++ b/source/stack/default/.gitea/workflows/build-and-deploy.yml @@ -15,7 +15,7 @@ jobs: name: 直传代码并部署到 Host15 runs-on: main container: - image: catthehacker/ubuntu:act-latest + image: ulthon/debian-php82-composer steps: - name: Checkout uses: actions/checkout@v4 @@ -57,6 +57,10 @@ jobs: PACKAGE_NAME: ${{ env.PACKAGE_NAME }} run: | set -euo pipefail + + composer config -g repos.packagist composer https://nexus.hl7.top:1243/repository/composer-proxy/ + composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader + TMP_PACKAGE="/tmp/${PACKAGE_NAME}" rm -f "$TMP_PACKAGE" "$PACKAGE_NAME" diff --git a/source/stack/default/docker-compose.yaml b/source/stack/default/docker-compose.yaml index 91c3d0c..8de07f5 100644 --- a/source/stack/default/docker-compose.yaml +++ b/source/stack/default/docker-compose.yaml @@ -13,7 +13,8 @@ services: ports: - "88:80" # HTTP volumes: - - ./runtime:/var/www/html/runtime - - ./public/storage:/var/www/html/public/storage - - ./public/build:/var/www/html/public/build - - ./storage:/var/www/html/storage + - ./:/var/www/html # 直接分发代码可以去掉注释并将下面的目录增加注释 + # - ./runtime:/var/www/html/runtime + # - ./public/storage:/var/www/html/public/storage + # - ./public/build:/var/www/html/public/build + # - ./storage:/var/www/html/storage diff --git a/source/stack/full/docker-compose.yaml b/source/stack/full/docker-compose.yaml index 91c3d0c..8de07f5 100644 --- a/source/stack/full/docker-compose.yaml +++ b/source/stack/full/docker-compose.yaml @@ -13,7 +13,8 @@ services: ports: - "88:80" # HTTP volumes: - - ./runtime:/var/www/html/runtime - - ./public/storage:/var/www/html/public/storage - - ./public/build:/var/www/html/public/build - - ./storage:/var/www/html/storage + - ./:/var/www/html # 直接分发代码可以去掉注释并将下面的目录增加注释 + # - ./runtime:/var/www/html/runtime + # - ./public/storage:/var/www/html/public/storage + # - ./public/build:/var/www/html/public/build + # - ./storage:/var/www/html/storage