Compare commits
3 Commits
7eed761861
...
8215b42e43
| Author | SHA1 | Date | |
|---|---|---|---|
| 8215b42e43 | |||
| db49f417df | |||
| 9e574fea85 |
@@ -132,7 +132,7 @@ jobs:
|
|||||||
--exclude='vendor' \
|
--exclude='vendor' \
|
||||||
--exclude='public/build' \
|
--exclude='public/build' \
|
||||||
-e "ssh -p 2224 -i ~/.ssh/id_rsa_prod -o StrictHostKeyChecking=no" \
|
-e "ssh -p 2224 -i ~/.ssh/id_rsa_prod -o StrictHostKeyChecking=no" \
|
||||||
./ root@erp.koori.tw:/var/www/koori-erp-prod/
|
./ root@erp.koori.tw:/var/www/star-erp/
|
||||||
rm ~/.ssh/id_rsa_prod
|
rm ~/.ssh/id_rsa_prod
|
||||||
|
|
||||||
|
|
||||||
@@ -146,7 +146,7 @@ jobs:
|
|||||||
username: root
|
username: root
|
||||||
key: ${{ secrets.PROD_SSH_KEY }}
|
key: ${{ secrets.PROD_SSH_KEY }}
|
||||||
script: |
|
script: |
|
||||||
cd /var/www/koori-erp-prod
|
cd /var/www/star-erp
|
||||||
# 檢查最近的 commit 是否包含 Dockerfile 或 compose.yaml 的變更
|
# 檢查最近的 commit 是否包含 Dockerfile 或 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"
|
||||||
@@ -163,7 +163,7 @@ jobs:
|
|||||||
username: root
|
username: root
|
||||||
key: ${{ secrets.PROD_SSH_KEY }}
|
key: ${{ secrets.PROD_SSH_KEY }}
|
||||||
script: |
|
script: |
|
||||||
cd /var/www/koori-erp-prod
|
cd /var/www/star-erp
|
||||||
chown -R 1000:1000 .
|
chown -R 1000:1000 .
|
||||||
|
|
||||||
# 檢查是否需要重建
|
# 檢查是否需要重建
|
||||||
@@ -173,7 +173,7 @@ jobs:
|
|||||||
else
|
else
|
||||||
echo "⚡ 無 Docker 檔案變更,僅重載服務..."
|
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 "容器未運行,正在啟動..."
|
echo "容器未運行,正在啟動..."
|
||||||
WWWGROUP=1000 WWWUSER=1000 docker compose up -d --wait
|
WWWGROUP=1000 WWWUSER=1000 docker compose up -d --wait
|
||||||
else
|
else
|
||||||
@@ -181,9 +181,9 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "容器狀態:" && docker ps --filter "name=koori-erp-laravel"
|
echo "容器狀態:" && docker ps --filter "name=star-erp-laravel"
|
||||||
|
|
||||||
docker exec -u 1000:1000 -w /var/www/html koori-erp-laravel sh -c "
|
docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c "
|
||||||
composer install --no-dev --optimize-autoloader &&
|
composer install --no-dev --optimize-autoloader &&
|
||||||
npm install &&
|
npm install &&
|
||||||
npm run build
|
npm run build
|
||||||
@@ -193,4 +193,4 @@ jobs:
|
|||||||
php artisan optimize &&
|
php artisan optimize &&
|
||||||
php artisan view:cache
|
php artisan view:cache
|
||||||
"
|
"
|
||||||
docker exec koori-erp-laravel chmod -R 775 /var/www/html/storage /var/www/html/bootstrap/cache
|
docker exec star-erp-laravel chmod -R 775 /var/www/html/storage /var/www/html/bootstrap/cache
|
||||||
@@ -15,6 +15,7 @@
|
|||||||
"laravel/tinker": "^2.10.1",
|
"laravel/tinker": "^2.10.1",
|
||||||
"spatie/laravel-activitylog": "^4.10",
|
"spatie/laravel-activitylog": "^4.10",
|
||||||
"spatie/laravel-permission": "^6.24",
|
"spatie/laravel-permission": "^6.24",
|
||||||
|
"stancl/jobpipeline": "^1.8",
|
||||||
"stancl/tenancy": "^3.9",
|
"stancl/tenancy": "^3.9",
|
||||||
"tightenco/ziggy": "^2.6"
|
"tightenco/ziggy": "^2.6"
|
||||||
},
|
},
|
||||||
|
|||||||
2
composer.lock
generated
2
composer.lock
generated
@@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "131ea6e8cc24a6a55229afded6bd9014",
|
"content-hash": "46092572c41c587bf3e7fc53465e5b56",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "brick/math",
|
"name": "brick/math",
|
||||||
|
|||||||
15
nginx/prod-proxy.conf
Normal file
15
nginx/prod-proxy.conf
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# 正式環境 (Production) - 端口 80
|
||||||
|
# 外部 SSL 終止後(如 Cloudflare/NPM)轉發至此端口
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name erp.koori.tw;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://star-erp-laravel:80;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Forwarded-Host $host;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user