diff --git a/.gitea/workflows/deploy-demo.yaml b/.gitea/workflows/deploy-demo.yaml index de40acc..c2e25e2 100644 --- a/.gitea/workflows/deploy-demo.yaml +++ b/.gitea/workflows/deploy-demo.yaml @@ -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-demo'; then + if ! docker ps --format '{{.Names}}' | grep -q 'star-erp-laravel'; 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-demo" + echo "容器狀態:" && docker ps --filter "name=star-erp-laravel" - 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-demo sh -c " + docker exec -u 1000:1000 -w /var/www/html star-erp-laravel 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-demo 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 diff --git a/compose.demo.yaml b/compose.demo.yaml index 612ccc6..6fadad6 100644 --- a/compose.demo.yaml +++ b/compose.demo.yaml @@ -1,12 +1,5 @@ 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' diff --git a/compose.prod.yaml b/compose.prod.yaml index 006589b..dc74f73 100644 --- a/compose.prod.yaml +++ b/compose.prod.yaml @@ -1,12 +1,5 @@ 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' diff --git a/compose.yaml b/compose.yaml index cb69e69..e7c38e7 100644 --- a/compose.yaml +++ b/compose.yaml @@ -6,7 +6,8 @@ services: args: WWWGROUP: '${WWWGROUP}' image: 'sail-8.5/app' - hostname: star-erp-laravel + container_name: laravel + hostname: laravel extra_hosts: - 'host.docker.internal:host-gateway' ports: @@ -28,7 +29,8 @@ services: # - mailpit mysql: image: 'mysql/mysql-server:8.0' - hostname: star-erp-mysql + container_name: mysql + hostname: mysql ports: - '${FORWARD_DB_PORT:-3306}:3306' environment: @@ -54,7 +56,8 @@ services: timeout: 5s redis: image: 'redis:alpine' - hostname: star-erp-redis + container_name: redis + hostname: redis # ports: # - '${FORWARD_REDIS_PORT:-6379}:6379' volumes: @@ -70,6 +73,8 @@ services: timeout: 5s proxy: image: 'nginx:alpine' + container_name: star-erp-proxy + container_name: star-erp-proxy networks: - sail depends_on: