refactor: 根據環境資訊還原容器名稱並維持多檔案 Compose 結構
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
|
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-demo'; then
|
if ! docker ps --format '{{.Names}}' | grep -q 'star-erp-laravel'; 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-demo"
|
echo "容器狀態:" && docker ps --filter "name=star-erp-laravel"
|
||||||
|
|
||||||
- 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-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 &&
|
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-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
|
||||||
|
|||||||
@@ -1,12 +1,5 @@
|
|||||||
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'
|
||||||
|
|||||||
@@ -1,12 +1,5 @@
|
|||||||
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'
|
||||||
|
|||||||
11
compose.yaml
11
compose.yaml
@@ -6,7 +6,8 @@ services:
|
|||||||
args:
|
args:
|
||||||
WWWGROUP: '${WWWGROUP}'
|
WWWGROUP: '${WWWGROUP}'
|
||||||
image: 'sail-8.5/app'
|
image: 'sail-8.5/app'
|
||||||
hostname: star-erp-laravel
|
container_name: laravel
|
||||||
|
hostname: laravel
|
||||||
extra_hosts:
|
extra_hosts:
|
||||||
- 'host.docker.internal:host-gateway'
|
- 'host.docker.internal:host-gateway'
|
||||||
ports:
|
ports:
|
||||||
@@ -28,7 +29,8 @@ services:
|
|||||||
# - mailpit
|
# - mailpit
|
||||||
mysql:
|
mysql:
|
||||||
image: 'mysql/mysql-server:8.0'
|
image: 'mysql/mysql-server:8.0'
|
||||||
hostname: star-erp-mysql
|
container_name: mysql
|
||||||
|
hostname: mysql
|
||||||
ports:
|
ports:
|
||||||
- '${FORWARD_DB_PORT:-3306}:3306'
|
- '${FORWARD_DB_PORT:-3306}:3306'
|
||||||
environment:
|
environment:
|
||||||
@@ -54,7 +56,8 @@ services:
|
|||||||
timeout: 5s
|
timeout: 5s
|
||||||
redis:
|
redis:
|
||||||
image: 'redis:alpine'
|
image: 'redis:alpine'
|
||||||
hostname: star-erp-redis
|
container_name: redis
|
||||||
|
hostname: redis
|
||||||
# ports:
|
# ports:
|
||||||
# - '${FORWARD_REDIS_PORT:-6379}:6379'
|
# - '${FORWARD_REDIS_PORT:-6379}:6379'
|
||||||
volumes:
|
volumes:
|
||||||
@@ -70,6 +73,8 @@ services:
|
|||||||
timeout: 5s
|
timeout: 5s
|
||||||
proxy:
|
proxy:
|
||||||
image: 'nginx:alpine'
|
image: 'nginx:alpine'
|
||||||
|
container_name: star-erp-proxy
|
||||||
|
container_name: star-erp-proxy
|
||||||
networks:
|
networks:
|
||||||
- sail
|
- sail
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|||||||
Reference in New Issue
Block a user