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