fix: 隔離正式與 Demo 環境的容器名稱以修復 CI/CD 衝突
Some checks failed
ERP-Deploy-Demo / deploy-demo (push) Failing after 26s
Some checks failed
ERP-Deploy-Demo / deploy-demo (push) Failing after 26s
This commit is contained in:
@@ -64,7 +64,7 @@ jobs:
|
||||
WWWGROUP=1000 WWWUSER=1000 docker compose -f compose.yaml -f compose.demo.yaml up -d --build --wait
|
||||
else
|
||||
echo "⚡ 無 Docker 檔案變更,僅重載服務..."
|
||||
if ! docker ps --format '{{.Names}}' | grep -q 'star-erp-laravel'; then
|
||||
if ! docker ps --format '{{.Names}}' | grep -q 'star-erp-laravel-demo'; then
|
||||
echo "容器未運行,正在啟動..."
|
||||
WWWGROUP=1000 WWWUSER=1000 docker compose -f compose.yaml -f compose.demo.yaml up -d --wait
|
||||
else
|
||||
@@ -72,7 +72,7 @@ jobs:
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "容器狀態:" && docker ps --filter "name=star-erp-laravel"
|
||||
echo "容器狀態:" && docker ps --filter "name=star-erp-laravel-demo"
|
||||
|
||||
- name: Step 4 - Composer & NPM Build
|
||||
uses: appleboy/ssh-action@master
|
||||
@@ -82,7 +82,7 @@ jobs:
|
||||
username: root
|
||||
key: ${{ secrets.DEMO_SSH_KEY }}
|
||||
script: |
|
||||
docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c "
|
||||
docker exec -u 1000:1000 -w /var/www/html star-erp-laravel-demo sh -c "
|
||||
composer install --no-dev --optimize-autoloader --no-interaction &&
|
||||
npm install &&
|
||||
npm run build &&
|
||||
@@ -97,4 +97,4 @@ jobs:
|
||||
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 star-erp-laravel-demo chmod -R 775 /var/www/html/storage /var/www/html/bootstrap/cache
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
services:
|
||||
laravel.test:
|
||||
container_name: star-erp-laravel-demo
|
||||
mysql:
|
||||
container_name: star-erp-mysql-demo
|
||||
redis:
|
||||
container_name: star-erp-redis-demo
|
||||
proxy:
|
||||
container_name: star-erp-proxy-demo
|
||||
ports:
|
||||
- '80:80'
|
||||
- '8080:8080'
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
services:
|
||||
laravel.test:
|
||||
container_name: star-erp-laravel
|
||||
mysql:
|
||||
container_name: star-erp-mysql
|
||||
redis:
|
||||
container_name: star-erp-redis
|
||||
proxy:
|
||||
container_name: star-erp-proxy
|
||||
ports:
|
||||
- '80:80'
|
||||
- '8080:8080'
|
||||
|
||||
@@ -6,7 +6,6 @@ services:
|
||||
args:
|
||||
WWWGROUP: '${WWWGROUP}'
|
||||
image: 'sail-8.5/app'
|
||||
container_name: star-erp-laravel
|
||||
hostname: star-erp-laravel
|
||||
extra_hosts:
|
||||
- 'host.docker.internal:host-gateway'
|
||||
@@ -29,7 +28,6 @@ services:
|
||||
# - mailpit
|
||||
mysql:
|
||||
image: 'mysql/mysql-server:8.0'
|
||||
container_name: star-erp-mysql
|
||||
hostname: star-erp-mysql
|
||||
ports:
|
||||
- '${FORWARD_DB_PORT:-3306}:3306'
|
||||
@@ -56,7 +54,6 @@ services:
|
||||
timeout: 5s
|
||||
redis:
|
||||
image: 'redis:alpine'
|
||||
container_name: star-erp-redis
|
||||
hostname: star-erp-redis
|
||||
# ports:
|
||||
# - '${FORWARD_REDIS_PORT:-6379}:6379'
|
||||
@@ -73,7 +70,6 @@ services:
|
||||
timeout: 5s
|
||||
proxy:
|
||||
image: 'nginx:alpine'
|
||||
container_name: star-erp-proxy
|
||||
networks:
|
||||
- sail
|
||||
depends_on:
|
||||
|
||||
Reference in New Issue
Block a user