From 8609d61f8223fd2146c82df7a4823045f6221176 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 3 Apr 2026 04:26:05 +0800 Subject: [PATCH] Use example compose and ignore local deploy env files --- .gitignore | 4 ++++ backend | 2 +- docker-compose.yml => docker-compose.example.yml | 0 docs/VPS_DEPLOY_RUNBOOK.md | 4 +++- frontend | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) rename docker-compose.yml => docker-compose.example.yml (100%) diff --git a/.gitignore b/.gitignore index b5e0838..d783a23 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,7 @@ dist/ *.log npm-debug.log* yarn-error.log* + +# Local deployment files +docker-compose.yml +docker-compose.override.yml diff --git a/backend b/backend index 4ae7e75..065f1d5 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 4ae7e75a96c0e0cf98448794e5e52b271e1d0820 +Subproject commit 065f1d52f0d66588773acfba019a7917de504cf9 diff --git a/docker-compose.yml b/docker-compose.example.yml similarity index 100% rename from docker-compose.yml rename to docker-compose.example.yml diff --git a/docs/VPS_DEPLOY_RUNBOOK.md b/docs/VPS_DEPLOY_RUNBOOK.md index 10a87b1..0134839 100644 --- a/docs/VPS_DEPLOY_RUNBOOK.md +++ b/docs/VPS_DEPLOY_RUNBOOK.md @@ -39,11 +39,13 @@ docker logs -f memberapi-backend ``` ### 用 docker compose(建議) -Compose 檔案:[docker-compose.yml](../docker-compose.yml) +Compose 檔案:[docker-compose.example.yml](../docker-compose.example.yml) 啟動: ```bash cd /opt/member-platform +cp docker-compose.example.yml docker-compose.yml + docker compose up -d --build ``` diff --git a/frontend b/frontend index cf54146..5631990 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit cf541466061d498f15df716bd3527ddaa2b93419 +Subproject commit 563199083d4ab50eaec4587070fdd82f3a4728a8