From 6a0f57c86c95d932d40af968e12ca88df29903de Mon Sep 17 00:00:00 2001 From: sky121113 Date: Fri, 13 Feb 2026 14:58:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E6=96=B0=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=20deploy-demo=20=E4=BB=BB=E5=8B=99=E4=BB=A5=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20YAML=20=E8=AA=9E=E6=B3=95=E9=8C=AF=E8=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy.yaml | 50 ++++++++++++------------------------ 1 file changed, 17 insertions(+), 33 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 6322684..15eb1bd 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -9,13 +9,12 @@ on: jobs: # --- 1. Demo 環境部署 (103 本機) --- deploy-demo: - if: false # github.ref == 'refs/heads/demo' (暫時停用) + if: false runs-on: ubuntu-latest steps: - name: Checkout Code uses: actions/checkout@v3 with: - # github-server-url: ${{ github.server_url }} # 自動偵測 repository: ${{ github.repository }} - name: Step 1 - Push Code to Demo @@ -35,7 +34,6 @@ jobs: ./ amba@192.168.0.103:/home/amba/star-erp/ rm ~/.ssh/id_rsa_demo - # 2. 檢查是否需要重建容器(只有 Dockerfile 或 compose.yaml 變動時才重建) - name: Step 2 - Check if Rebuild Needed id: check_rebuild uses: appleboy/ssh-action@master @@ -46,14 +44,12 @@ jobs: key: ${{ secrets.DEMO_SSH_KEY }} script: | cd /home/amba/star-erp - # 檢查最近的 commit 是否包含 Dockerfile 或 compose.yaml 的變更 if git diff --name-only HEAD~1 HEAD 2>/dev/null | grep -qE '(Dockerfile|compose\.yaml|docker-compose\.yaml)'; then echo "REBUILD_NEEDED=true" else echo "REBUILD_NEEDED=false" fi - # 3. 啟動或重建容器(根據檢查結果決定是否加 --build) - name: Step 3 - Container Up & Health Check uses: appleboy/ssh-action@master with: @@ -64,14 +60,11 @@ jobs: script: | cd /home/amba/koori-erp chown -R 1000:1000 . - - # 檢查是否需要重建 if git diff --name-only HEAD~1 HEAD 2>/dev/null | grep -qE '(Dockerfile|compose\.yaml|docker-compose\.yaml)'; then echo "🔄 偵測到 Docker 相關檔案變更,執行完整重建..." WWWGROUP=1000 WWWUSER=1000 docker compose up -d --build --wait else echo "⚡ 無 Docker 檔案變更,僅重載服務..." - # 確保容器正在運行(若未運行則啟動) if ! docker ps --format '{{.Names}}' | grep -q 'koori-erp-laravel'; then echo "容器未運行,正在啟動..." WWWGROUP=1000 WWWUSER=1000 docker compose up -d --wait @@ -79,10 +72,8 @@ jobs: echo "容器已運行,跳過 docker compose,直接進行程式碼部署..." fi fi - echo "容器狀態:" && docker ps --filter "name=koori-erp-laravel" - - name: Step 4 - Composer & NPM Build uses: appleboy/ssh-action@master with: @@ -93,29 +84,22 @@ jobs: envs: GITEA_SHA script: | docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c " - # 0. 更新版本號 (使用 Gitea 提供的 SHA) - VERSION=\"v1.0-\${GITEA_SHA:0:7}\" - sed -i \"s/^APP_VERSION=.*/APP_VERSION=\$VERSION/\" .env || echo \"APP_VERSION=\$VERSION\" >> .env - - # 1. 後端依賴 - composer install --no-dev --optimize-autoloader --no-interaction && - - # 2. 前端編譯 - npm install && - npm run build && - - # 3. Laravel 初始化與優化 - php artisan storage:link && - php artisan migrate --force && - php artisan tenants:migrate --force && - php artisan db:seed --force && - php artisan tenants:run db:seed --option="class=PermissionSeeder" --option="force=true" && - php artisan permission:cache-reset && - php artisan optimize:clear && - php artisan optimize && - php artisan view:cache - " - docker exec star-erp-laravel chmod -R 775 /var/www/html/storage /var/www/html/bootstrap/cache + VERSION=\"v1.0-\${GITEA_SHA:0:7}\" + sed -i \"s/^APP_VERSION=.*/APP_VERSION=\$VERSION/\" .env || echo \"APP_VERSION=\$VERSION\" >> .env + composer install --no-dev --optimize-autoloader --no-interaction && + npm install && + npm run build && + php artisan storage:link && + php artisan migrate --force && + php artisan tenants:migrate --force && + php artisan db:seed --force && + php artisan tenants:run db:seed --option=\"class=PermissionSeeder\" --option=\"force=true\" && + php artisan permission:cache-reset && + php artisan optimize:clear && + php artisan optimize && + php artisan view:cache + " + docker exec star-erp-laravel chmod -R 775 /var/www/html/storage /var/www/html/bootstrap/cache # --- 2. 正式環境部署 (erp.koori.tw:2224) --- deploy-production: