diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 4f7c249..6c97109 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -7,7 +7,7 @@ on: - main jobs: - # --- 1. Demo 環境部署 (103 本機) --- + # --- 1. Demo 環境部署 (gitea_work) --- deploy-demo: if: github.ref == 'refs/heads/demo' runs-on: ubuntu-latest @@ -31,8 +31,8 @@ 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 變動時才重建) @@ -40,12 +40,12 @@ jobs: 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" @@ -57,12 +57,12 @@ jobs: - 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 . # 檢查是否需要重建 @@ -72,7 +72,7 @@ jobs: 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 @@ -80,15 +80,16 @@ jobs: 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 " 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;