fix: 隔離正式與 Demo 環境的容器名稱以修復 CI/CD 衝突
Some checks failed
ERP-Deploy-Demo / deploy-demo (push) Failing after 26s

This commit is contained in:
2026-02-23 17:17:07 +08:00
parent 8e3d951d0d
commit 54e1e5df5a
4 changed files with 18 additions and 8 deletions

View File

@@ -64,7 +64,7 @@ jobs:
WWWGROUP=1000 WWWUSER=1000 docker compose -f compose.yaml -f compose.demo.yaml 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-demo'; then
echo "容器未運行,正在啟動..." echo "容器未運行,正在啟動..."
WWWGROUP=1000 WWWUSER=1000 docker compose -f compose.yaml -f compose.demo.yaml up -d --wait WWWGROUP=1000 WWWUSER=1000 docker compose -f compose.yaml -f compose.demo.yaml up -d --wait
else else
@@ -72,7 +72,7 @@ jobs:
fi fi
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 - name: Step 4 - Composer & NPM Build
uses: appleboy/ssh-action@master uses: appleboy/ssh-action@master
@@ -82,7 +82,7 @@ jobs:
username: root username: root
key: ${{ secrets.DEMO_SSH_KEY }} key: ${{ secrets.DEMO_SSH_KEY }}
script: | 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 && composer install --no-dev --optimize-autoloader --no-interaction &&
npm install && npm install &&
npm run build && npm run build &&
@@ -97,4 +97,4 @@ jobs:
php artisan optimize && php artisan optimize &&
php artisan view:cache 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

View File

@@ -1,5 +1,12 @@
services: services:
laravel.test:
container_name: star-erp-laravel-demo
mysql:
container_name: star-erp-mysql-demo
redis:
container_name: star-erp-redis-demo
proxy: proxy:
container_name: star-erp-proxy-demo
ports: ports:
- '80:80' - '80:80'
- '8080:8080' - '8080:8080'

View File

@@ -1,5 +1,12 @@
services: services:
laravel.test:
container_name: star-erp-laravel
mysql:
container_name: star-erp-mysql
redis:
container_name: star-erp-redis
proxy: proxy:
container_name: star-erp-proxy
ports: ports:
- '80:80' - '80:80'
- '8080:8080' - '8080:8080'

View File

@@ -6,7 +6,6 @@ services:
args: args:
WWWGROUP: '${WWWGROUP}' WWWGROUP: '${WWWGROUP}'
image: 'sail-8.5/app' image: 'sail-8.5/app'
container_name: star-erp-laravel
hostname: star-erp-laravel hostname: star-erp-laravel
extra_hosts: extra_hosts:
- 'host.docker.internal:host-gateway' - 'host.docker.internal:host-gateway'
@@ -29,7 +28,6 @@ services:
# - mailpit # - mailpit
mysql: mysql:
image: 'mysql/mysql-server:8.0' image: 'mysql/mysql-server:8.0'
container_name: star-erp-mysql
hostname: star-erp-mysql hostname: star-erp-mysql
ports: ports:
- '${FORWARD_DB_PORT:-3306}:3306' - '${FORWARD_DB_PORT:-3306}:3306'
@@ -56,7 +54,6 @@ services:
timeout: 5s timeout: 5s
redis: redis:
image: 'redis:alpine' image: 'redis:alpine'
container_name: star-erp-redis
hostname: star-erp-redis hostname: star-erp-redis
# ports: # ports:
# - '${FORWARD_REDIS_PORT:-6379}:6379' # - '${FORWARD_REDIS_PORT:-6379}:6379'
@@ -73,7 +70,6 @@ services:
timeout: 5s timeout: 5s
proxy: proxy:
image: 'nginx:alpine' image: 'nginx:alpine'
container_name: star-erp-proxy
networks: networks:
- sail - sail
depends_on: depends_on: