From 01386b7aa25c9d712f5e3e82996850119bf31e6c Mon Sep 17 00:00:00 2001 From: sky121113 Date: Mon, 5 Jan 2026 22:31:38 +0800 Subject: [PATCH] fff --- .gitea/workflows/deploy.yaml | 138 +++++++++++++++++------------------ 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index e2ab33c..6df55ea 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -50,89 +50,37 @@ # run: | # docker restart koori-erp-laravel -name: Koori-ERP-Demo-Deploy -on: - push: - branches: - - main -jobs: - sync-update: - runs-on: demo-server - steps: - - name: 1. Checkout New Code - run: | - rm -rf ./* - git clone -b main http://server:3000/${{ gitea.repository }}.git . - - - name: 2. Stop Container First - run: | - # 先停止容器 - docker compose down || true - - - name: 3. Prepare Environment - run: | - # 建立 .env(在宿主機) - cp .env.example .env - sed -i "s|APP_KEY=.*|APP_KEY=${{ secrets.APP_KEY }}|g" .env - - - name: 4. Start Container (Files Already Ready) - run: | - # 啟動容器(檔案已經準備好,透過 volume 自動掛載) - docker compose up -d --build --force-recreate --wait - tar --exclude='.git' --exclude='node_modules' --exclude='vendor' -cf - . | docker exec -i koori-erp-laravel tar -xf - -C /var/www/html - - name: 5. Backend & Frontend Build - run: | - docker exec -w /var/www/html koori-erp-laravel sh -c " - composer install --optimize-autoloader && - npm install && - npm run build && - php artisan migrate --force && - php artisan optimize:clear - " - - - name: 6. Final Permission Fix - run: | - docker exec koori-erp-laravel chown -R 1000:1000 /var/www/html - docker exec koori-erp-laravel chmod -R 775 /var/www/html/storage - # name: Koori-ERP-Demo-Deploy # on: # push: # branches: # - main - # jobs: # sync-update: # runs-on: demo-server # steps: -# # - name: 1. Checkout New Code -# # uses: actions/checkout@v3 -# # with: -# # github-server-url: http://192.168.0.103:3000 -# # repository: ${{ gitea.repository }} # - name: 1. Checkout New Code # run: | -# # 進入工作目錄並直接用 git 抓 code,完全不需要 Node # rm -rf ./* # git clone -b main http://server:3000/${{ gitea.repository }}.git . -# - name: 2. Sync Files to Running Container -# run: | -# # A. 執行複製 +# - name: 2. Stop Container First +# run: | +# # 先停止容器 +# docker compose down || true + +# - name: 3. Prepare Environment +# run: | +# # 建立 .env(在宿主機) # cp .env.example .env # sed -i "s|APP_KEY=.*|APP_KEY=${{ secrets.APP_KEY }}|g" .env -# # B. 確保容器環境是最新的 -# # --wait 會確保容器真的跑起來了才執行下一步 -# docker compose -p koori-erp up -d --build --force-recreate --wait -# # C. 執行精簡化複製 (關鍵優化!) -# # 排除 .git, node_modules, vendor 這三大黑洞 -# tar --exclude='.git' \ -# --exclude='node_modules' \ -# --exclude='vendor' \ -# -cf - . | docker exec -i koori-erp-laravel tar -xf - -C /var/www/html - -# - name: 3. Backend & Frontend Build +# - name: 4. Start Container (Files Already Ready) +# run: | +# # 啟動容器(檔案已經準備好,透過 volume 自動掛載) +# docker compose up -d --build --force-recreate --wait +# tar --exclude='.git' --exclude='node_modules' --exclude='vendor' -cf - . | docker exec -i koori-erp-laravel tar -xf - -C /var/www/html +# - name: 5. Backend & Frontend Build # run: | # docker exec -w /var/www/html koori-erp-laravel sh -c " # composer install --optimize-autoloader && @@ -142,8 +90,60 @@ jobs: # php artisan optimize:clear # " -# - name: 4. Final Permission Fix +# - name: 6. Final Permission Fix # run: | -# # 統一修正權限 # docker exec koori-erp-laravel chown -R 1000:1000 /var/www/html -# docker exec koori-erp-laravel chmod -R 775 /var/www/html/storage /var/www/html/bootstrap/cache +# docker exec koori-erp-laravel chmod -R 775 /var/www/html/storage + +name: Koori-ERP-Demo-Deploy +on: + push: + branches: + - main + +jobs: + sync-update: + runs-on: demo-server + steps: + # - name: 1. Checkout New Code + # uses: actions/checkout@v3 + # with: + # github-server-url: http://192.168.0.103:3000 + # repository: ${{ gitea.repository }} + - name: 1. Checkout New Code + run: | + # 進入工作目錄並直接用 git 抓 code,完全不需要 Node + rm -rf ./* + git clone -b main http://server:3000/${{ gitea.repository }}.git . + + - name: 2. Sync Files to Running Container + run: | + # A. 執行複製 + cp .env.example .env + sed -i "s|APP_KEY=.*|APP_KEY=${{ secrets.APP_KEY }}|g" .env + # B. 確保容器環境是最新的 + # --wait 會確保容器真的跑起來了才執行下一步 + docker compose -p koori-erp up -d --build --force-recreate --wait + + # C. 執行精簡化複製 (關鍵優化!) + # 排除 .git, node_modules, vendor 這三大黑洞 + tar --exclude='.git' \ + --exclude='node_modules' \ + --exclude='vendor' \ + -cf - . | docker exec -i koori-erp-laravel tar -xf - -C /var/www/html + + - name: 3. Backend & Frontend Build + run: | + docker exec -w /var/www/html koori-erp-laravel sh -c " + composer install --optimize-autoloader && + npm install && + npm run build && + php artisan migrate --force && + php artisan optimize:clear + " + + - name: 4. Final Permission Fix + run: | + # 統一修正權限 + docker exec koori-erp-laravel chown -R 1000:1000 /var/www/html + docker exec koori-erp-laravel chmod -R 775 /var/www/html/storage /var/www/html/bootstrap/cache