diff --git a/docker-compose.git.yml b/docker-compose.git.yml deleted file mode 100644 index 5364a1c..0000000 --- a/docker-compose.git.yml +++ /dev/null @@ -1,13 +0,0 @@ -services: - git_worker: - build: - context: . - dockerfile: Dockerfile.git - container_name: git_worker - volumes: - - ./data:/app - - ./data/git/logs/:/var/log/ - environment: - - REPO_URL=${REPO_URL} - - BRANCH=${REPO_BRANCH} - restart: unless-stopped \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 3b547dc..48090d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,16 @@ services: + git_worker: + build: + context: . + dockerfile: Dockerfile.git + container_name: ${APP_NAME}_git_worker + volumes: + - ./data:/app + - ./data/git/logs/:/var/log/ + environment: + - REPO_URL=${REPO_URL} + - BRANCH=${REPO_BRANCH} + restart: unless-stopped mariadb: image: mariadb:10.6 container_name: ${APP_NAME}_db diff --git a/start.sh b/start.sh index 978fe5a..6ace948 100755 --- a/start.sh +++ b/start.sh @@ -17,23 +17,19 @@ fi PROJECT_NAME="${APP_NAME}" NETWORK_NAME="${APP_NAME}_network" -# 檢查並建立 network(如果不存在) -if ! docker network ls --format '{{.Name}}' | grep -wq "$NETWORK_NAME"; then - echo "🔌 建立 Docker 網路 $NETWORK_NAME ..." - docker network create $NETWORK_NAME -else - echo "🔌 Docker 網路 $NETWORK_NAME 已存在" -fi - # 組合額外參數(如果有需要清除 volume 與 image) EXTRA_FLAGS="up -d" if [ "$WIPE" == "true" ]; then EXTRA_FLAGS="up -d --build" + # 檢查並建立 network(如果不存在) + if ! docker network ls --format '{{.Name}}' | grep -wq "$NETWORK_NAME"; then + echo "🔌 建立 Docker 網路 $NETWORK_NAME ..." + docker network create $NETWORK_NAME + else + echo "🔌 Docker 網路 $NETWORK_NAME 已存在" + fi fi -echo "🚀 get APP to git services..." -docker compose -p $PROJECT_NAME -f docker-compose.git.yml $EXTRA_FLAGS - echo "🚀 Starting APP services..." docker compose -p $PROJECT_NAME -f docker-compose.yml $EXTRA_FLAGS diff --git a/stop.sh b/stop.sh index 9abe12c..e01813e 100755 --- a/stop.sh +++ b/stop.sh @@ -27,9 +27,6 @@ fi echo "🛑 Stopping APP services..." docker compose -p "$PROJECT_NAME" -f docker-compose.yml down $EXTRA_FLAGS -echo "🛑 Stopping git services..." -docker compose -p "$PROJECT_NAME" -f docker-compose.git.yml down $EXTRA_FLAGS - if [ "$WIPE" == "true" ]; then # 檢查並建立 network(如果不存在) if ! docker network ls --format '{{.Name}}' | grep -wq "$NETWORK_NAME"; then diff --git a/開發紀錄.txt b/開發紀錄.txt new file mode 100644 index 0000000..056b2a2 --- /dev/null +++ b/開發紀錄.txt @@ -0,0 +1,101 @@ + • 啟動所有服務:./start.sh --wipe + • 停止服務保留資料:./stop.sh + • 停止並清除資料:./stop.sh --wipe +# 正常重啟,不刪除資料 +./restart.sh + +# 重啟並清除 volumes 和 images +./restart.sh --wipe + + +連映像檔(images)都刪除。 +docker compose -f docker-compose.git.yml up -d --build +docker compose -f docker-compose.git.yml down -v --rmi all + +docker network create ktvcentral_network +docker network create app_network + +docker compose -p ktvcentral -f docker-compose.yml up -d --build + +docker compose -p ktvcentral -f docker-compose.yml build + +docker compose -p ktvcentral -f docker-compose.yml up -d + + +docker compose -p ktvcentral -f docker-compose.yml down -v + + + +docker network rm app_network +docker volume prune -f +docker image prune -a -f + + +docker compose build +docker compose up -d + +docker compose down -v --rmi all +docker compose down -v +docker compose up -d --build + + docker logs ktvcentral_app + +docker exec -it ktvcentral_app php artisan migrate + docker exec -it ktvcentral_nginx sh + + + cp .env.example .env + cp default.conf.template default.conf + superstarzqd.dnsnet.cc + + + + docker-compose up -d + +若要重新載入設定與清除舊資料: +docker-compose down -v +docker-compose up -d --build + + +docker exec -it karaoke_app php artisan queue:table +docker exec -it karaoke_app php artisan migrate + +docker-compose build +docker-compose up -d + +docker ps + +up: + docker-compose up -d + +down: + docker-compose down -v + +restart: + docker-compose down -v && docker-compose up -d --build + +artisan: + docker exec -it ktvcentral_app php artisan $(cmd) + +npm: + docker exec -it ktvcentral_app npm $(cmd) + +bash: + docker exec -it ktvcentral_app bash + + + docker exec -it ktvcentral_nginx bash + + + +docker exec -it ktvcentral_app php artisan $(cmd) + + +docker exec -it ktvcentral_app php artisan transfer:sqlite sqlite/tempUser.sqlite --sync + + +docker exec -it ktvcentral_app php artisan migrate:rollback + +docker exec -it ktvcentral_app php artisan migrate --force + +