Compare commits
3 Commits
747f70865d
...
2a88649f75
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a88649f75 | |||
| e9313158ba | |||
| f3da49a76a |
@@ -59,14 +59,14 @@ jobs:
|
|||||||
cd /var/www/star-erp-demo
|
cd /var/www/star-erp-demo
|
||||||
chown -R 1000:1000 .
|
chown -R 1000:1000 .
|
||||||
|
|
||||||
if git diff --name-only HEAD~1 HEAD 2>/dev/null | grep -qE '(Dockerfile|compose\.yaml|docker-compose\.yaml)'; then
|
if git diff --name-only HEAD~1 HEAD 2>/dev/null | grep -qE '(Dockerfile|compose\.yaml|compose\.demo\.yaml|docker-compose\.yaml)'; then
|
||||||
echo "🔄 偵測到 Docker 相關檔案變更,執行完整重建..."
|
echo "🔄 偵測到 Docker 相關檔案變更,執行完整重建..."
|
||||||
WWWGROUP=1000 WWWUSER=1000 docker compose up -d --build --wait
|
WWWGROUP=1000 WWWUSER=1000 docker compose -f compose.yaml -f compose.demo.yaml up -d --build --wait
|
||||||
else
|
else
|
||||||
echo "⚡ 無 Docker 檔案變更,僅重載服務..."
|
echo "⚡ 無 Docker 檔案變更,僅重載服務..."
|
||||||
if ! docker ps --format '{{.Names}}' | grep -q 'star-erp-laravel'; then
|
if ! docker ps --format '{{.Names}}' | grep -q 'star-erp-laravel'; then
|
||||||
echo "容器未運行,正在啟動..."
|
echo "容器未運行,正在啟動..."
|
||||||
WWWGROUP=1000 WWWUSER=1000 docker compose up -d --wait
|
WWWGROUP=1000 WWWUSER=1000 docker compose -f compose.yaml -f compose.demo.yaml up -d --wait
|
||||||
else
|
else
|
||||||
echo "容器已運行,跳過 docker compose,直接進行程式碼部署..."
|
echo "容器已運行,跳過 docker compose,直接進行程式碼部署..."
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -41,9 +41,6 @@ jobs:
|
|||||||
key: ${{ secrets.PROD_SSH_KEY }}
|
key: ${{ secrets.PROD_SSH_KEY }}
|
||||||
script: |
|
script: |
|
||||||
cd /var/www/star-erp
|
cd /var/www/star-erp
|
||||||
# [Patch] 修正正式機 Nginx Proxy 配置 (對應外部 SSL/OpenResty)
|
|
||||||
sed -i "s/- '8080:8080'/- '80:80'\n - '8080:8080'/" compose.yaml
|
|
||||||
sed -i "s/demo-proxy.conf/prod-proxy.conf/" compose.yaml
|
|
||||||
|
|
||||||
if git diff --name-only HEAD~1 HEAD 2>/dev/null | grep -qE '(Dockerfile|compose\.yaml|docker-compose\.yaml)'; then
|
if git diff --name-only HEAD~1 HEAD 2>/dev/null | grep -qE '(Dockerfile|compose\.yaml|docker-compose\.yaml)'; then
|
||||||
echo "REBUILD_NEEDED=true"
|
echo "REBUILD_NEEDED=true"
|
||||||
@@ -62,14 +59,14 @@ jobs:
|
|||||||
cd /var/www/star-erp
|
cd /var/www/star-erp
|
||||||
chown -R 1000:1000 .
|
chown -R 1000:1000 .
|
||||||
|
|
||||||
if git diff --name-only HEAD~1 HEAD 2>/dev/null | grep -qE '(Dockerfile|compose\.yaml|docker-compose\.yaml)'; then
|
if git diff --name-only HEAD~1 HEAD 2>/dev/null | grep -qE '(Dockerfile|compose\.yaml|compose\.prod\.yaml|docker-compose\.yaml)'; then
|
||||||
echo "🔄 偵測到 Docker 相關檔案變更,執行完整重建..."
|
echo "🔄 偵測到 Docker 相關檔案變更,執行完整重建..."
|
||||||
WWWGROUP=1000 WWWUSER=1000 docker compose up -d --build --wait
|
WWWGROUP=1000 WWWUSER=1000 docker compose -f compose.yaml -f compose.prod.yaml up -d --build --wait
|
||||||
else
|
else
|
||||||
echo "⚡ 無 Docker 檔案變更,僅重載服務..."
|
echo "⚡ 無 Docker 檔案變更,僅重載服務..."
|
||||||
if ! docker ps --format '{{.Names}}' | grep -q 'star-erp-laravel'; then
|
if ! docker ps --format '{{.Names}}' | grep -q 'star-erp-laravel'; then
|
||||||
echo "容器未運行,正在啟動..."
|
echo "容器未運行,正在啟動..."
|
||||||
WWWGROUP=1000 WWWUSER=1000 docker compose up -d --wait
|
WWWGROUP=1000 WWWUSER=1000 docker compose -f compose.yaml -f compose.prod.yaml up -d --wait
|
||||||
else
|
else
|
||||||
echo "容器已運行,跳過 docker compose,直接進行程式碼部署..."
|
echo "容器已運行,跳過 docker compose,直接進行程式碼部署..."
|
||||||
fi
|
fi
|
||||||
|
|||||||
6
compose.demo.yaml
Normal file
6
compose.demo.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
services:
|
||||||
|
proxy:
|
||||||
|
ports:
|
||||||
|
- '8080:8080'
|
||||||
|
volumes:
|
||||||
|
- './nginx/demo-proxy.conf:/etc/nginx/conf.d/default.conf:ro'
|
||||||
7
compose.prod.yaml
Normal file
7
compose.prod.yaml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
services:
|
||||||
|
proxy:
|
||||||
|
ports:
|
||||||
|
- '80:80'
|
||||||
|
- '8080:8080'
|
||||||
|
volumes:
|
||||||
|
- './nginx/prod-proxy.conf:/etc/nginx/conf.d/default.conf:ro'
|
||||||
@@ -74,11 +74,6 @@ services:
|
|||||||
proxy:
|
proxy:
|
||||||
image: 'nginx:alpine'
|
image: 'nginx:alpine'
|
||||||
container_name: star-erp-proxy
|
container_name: star-erp-proxy
|
||||||
ports:
|
|
||||||
- '8080:8080'
|
|
||||||
- '8081:8081'
|
|
||||||
volumes:
|
|
||||||
- './nginx/demo-proxy.conf:/etc/nginx/conf.d/default.conf:ro'
|
|
||||||
networks:
|
networks:
|
||||||
- sail
|
- sail
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|||||||
Reference in New Issue
Block a user