diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 8570ee7..4a05d8c 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -7,14 +7,15 @@ on: - main jobs: - # --- 1. Demo 環境部署 (103 本機) --- + # --- 1. Demo 環境部署 (gitea_work) --- deploy-demo: - if: false + if: github.ref == 'refs/heads/demo' runs-on: ubuntu-latest steps: - name: Checkout Code uses: actions/checkout@v3 with: + github-server-url: https://gitea.taiwan-star.com.tw repository: ${{ github.repository }} - name: Step 1 - Push Code to Demo @@ -30,79 +31,89 @@ jobs: --exclude='storage' \ --exclude='.env' \ --exclude='public/build' \ - -e "ssh -i ~/.ssh/id_rsa_demo -o StrictHostKeyChecking=no" \ - ./ amba@192.168.0.103:/home/amba/star-erp/ + -e "ssh -p 2227 -i ~/.ssh/id_rsa_demo -o StrictHostKeyChecking=no" \ + ./ root@220.132.7.82:/var/www/star-erp-demo/ rm ~/.ssh/id_rsa_demo + # 2. 檢查是否需要重建容器（只有 Dockerfile 或 compose.yaml 變動時才重建） - name: Step 2 - Check if Rebuild Needed id: check_rebuild uses: appleboy/ssh-action@master with: - host: 192.168.0.103 - port: 22 - username: amba + host: 220.132.7.82 + port: 2227 + username: root key: ${{ secrets.DEMO_SSH_KEY }} script: | - cd /home/amba/star-erp + cd /var/www/star-erp-demo + # 檢查最近的 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: - host: 192.168.0.103 - port: 22 - username: amba + host: 220.132.7.82 + port: 2227 + username: root key: ${{ secrets.DEMO_SSH_KEY }} script: | - cd /home/amba/koori-erp + cd /var/www/star-erp-demo 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 + # 確保容器正在運行（若未運行則啟動） + if ! docker ps --format '{{.Names}}' | grep -q 'star-erp-laravel'; then echo "容器未運行，正在啟動..." WWWGROUP=1000 WWWUSER=1000 docker compose up -d --wait else echo "容器已運行，跳過 docker compose，直接進行程式碼部署..." fi fi - echo "容器狀態：" && docker ps --filter "name=koori-erp-laravel" + + echo "容器狀態：" && docker ps --filter "name=star-erp-laravel" + + - name: Step 4 - Composer & NPM Build uses: appleboy/ssh-action@master with: - host: 192.168.0.103 - port: 22 - username: amba + host: 220.132.7.82 + port: 2227 + username: root key: ${{ secrets.DEMO_SSH_KEY }} script: | - docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c " - # 0. 更新版本號 (直接使用 Github Actions 變數注入) - VERSION=\"v1.0-$(echo '${{ github.sha }}' | cut -c1-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 + docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c " + # 1. 後端依賴 (Demo 環境建議加上 --no-interaction 避免卡住) + 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 - # --- 2. 正式環境部署 (erp.koori.tw:2224) --- + # --- 2. 正式環境部署 (220.132.7.82:2227) --- deploy-production: if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest @@ -125,8 +136,8 @@ jobs: --exclude='vendor' \ --exclude='storage' \ --exclude='public/build' \ - -e "ssh -p 2224 -i ~/.ssh/id_rsa_prod -o StrictHostKeyChecking=no" \ - ./ root@erp.koori.tw:/var/www/star-erp/ + -e "ssh -p 2227 -i ~/.ssh/id_rsa_prod -o StrictHostKeyChecking=no" \ + ./ root@220.132.7.82:/var/www/star-erp/ rm ~/.ssh/id_rsa_prod @@ -135,8 +146,8 @@ jobs: id: check_rebuild_prod uses: appleboy/ssh-action@master with: - host: erp.koori.tw - port: 2224 + host: 220.132.7.82 + port: 2227 username: root key: ${{ secrets.PROD_SSH_KEY }} script: | @@ -156,8 +167,8 @@ jobs: - name: Step 3 - Container Up & Health Check uses: appleboy/ssh-action@master with: - host: erp.koori.tw - port: 2224 + host: 220.132.7.82 + port: 2227 username: root key: ${{ secrets.PROD_SSH_KEY }} script: | @@ -169,6 +180,7 @@ jobs: WWWGROUP=1000 WWWUSER=1000 docker compose up -d --build --wait else echo "⚡ 無 Docker 檔案變更，僅重載服務..." + # 確保容器正在運行（若未運行則啟動） if ! docker ps --format '{{.Names}}' | grep -q 'star-erp-laravel'; then echo "容器未運行，正在啟動..." WWWGROUP=1000 WWWUSER=1000 docker compose up -d --wait @@ -180,10 +192,6 @@ jobs: echo "容器狀態：" && docker ps --filter "name=star-erp-laravel" docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c " - # 0. 更新版本號 (直接注入) - VERSION=\"v1.0-$(echo '${{ github.sha }}' | cut -c1-7)\" - sed -i \"s/^APP_VERSION=.*/APP_VERSION=\$VERSION/\" .env || echo \"APP_VERSION=\$VERSION\" >> .env - composer install --no-dev --optimize-autoloader && npm install && npm run build diff --git a/nginx/demo-proxy.conf b/nginx/demo-proxy.conf index e26b53d..d9a2e78 100644 --- a/nginx/demo-proxy.conf +++ b/nginx/demo-proxy.conf @@ -1,7 +1,7 @@ # 總後台 (landlord) - 端口 8080 server { listen 8080; - server_name 192.168.0.103; + server_name _; location / { proxy_pass http://star-erp-laravel:80; @@ -16,7 +16,7 @@ server { # koori 租戶 - 端口 8081 server { listen 8081; - server_name 192.168.0.103; + server_name _; location / { proxy_pass http://star-erp-laravel:80;