From 505e512b8e97a3abc0fc0c93cc64d7a56edc175a Mon Sep 17 00:00:00 2001 From: "takemi.ohama" Date: Sun, 16 Aug 2026 01:53:49 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=A9=9F=E5=AF=86=E3=81=AE=E5=8F=97?= =?UTF-8?q?=E3=81=91=E6=B8=A1=E3=81=97=E3=82=92=E7=92=B0=E5=A2=83=E5=A4=89?= =?UTF-8?q?=E6=95=B0=E6=B3=A8=E5=85=A5=E3=81=B8=E7=A7=BB=E8=A1=8C=20(PLAN3?= =?UTF-8?q?5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit devbase 側で環境変数の暗号化 (PLAN35 / devbasex/devbase#90) を導入したのに 合わせ、`devbase env encrypt` が行う compose.yml の書き換えを取り込む。 機密ファイル (`${DEVBASE_ROOT}/.env` と `.env`) の env_file 参照を外し、 devbase が起動時に復号して変数名だけを列挙した構成で注入する形にする。 暗号化していない環境でも秘密ストアが平文へフォールバックして同じ経路で 注入されるため、`devbase up` 経由なら両モードで動作する。 あわせて、up が生成する .docker-compose.scale.yml と、その退避ファイル (.prev) を除外対象に追加する。 Co-Authored-By: Claude Opus 5 --- .gitignore | 1 + adminer/projects/adminer/compose.yml | 4 ++-- ai-plugins/projects/ai-plugins/compose.yml | 4 ++-- devbase/projects/devbase/compose.yml | 4 ++-- github_work_time/projects/github_work_time/compose.yml | 2 +- md-specgen/projects/md-specgen/compose.yml | 2 +- tmllib/projects/tmllib/compose.yml | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index ba3a98d..2922be6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store *.swp .env +.docker-compose.scale.yml* diff --git a/adminer/projects/adminer/compose.yml b/adminer/projects/adminer/compose.yml index 6d76fbf..59eb916 100644 --- a/adminer/projects/adminer/compose.yml +++ b/adminer/projects/adminer/compose.yml @@ -10,9 +10,9 @@ services: # AWS SSO使用時のみコメントを外してください: # - ~/.aws:/home/ubuntu/.aws env_file: - - ${DEVBASE_ROOT}/.env + # devbase(PLAN35) 機密は環境変数で注入: - ${DEVBASE_ROOT}/.env - env - - .env + # devbase(PLAN35) 機密は環境変数で注入: - .env group_add: ["${DOCKER_GID}"] command: tail -f /dev/null working_dir: /work diff --git a/ai-plugins/projects/ai-plugins/compose.yml b/ai-plugins/projects/ai-plugins/compose.yml index 16454cd..4c42bde 100644 --- a/ai-plugins/projects/ai-plugins/compose.yml +++ b/ai-plugins/projects/ai-plugins/compose.yml @@ -10,9 +10,9 @@ services: # AWS SSO使用時のみコメントを外してください: # - ~/.aws:/home/ubuntu/.aws env_file: - - ${DEVBASE_ROOT}/.env + # devbase(PLAN35) 機密は環境変数で注入: - ${DEVBASE_ROOT}/.env - env - - .env + # devbase(PLAN35) 機密は環境変数で注入: - .env group_add: ["${DOCKER_GID}"] command: tail -f /dev/null working_dir: /work diff --git a/devbase/projects/devbase/compose.yml b/devbase/projects/devbase/compose.yml index f9a9636..64b0c60 100644 --- a/devbase/projects/devbase/compose.yml +++ b/devbase/projects/devbase/compose.yml @@ -11,9 +11,9 @@ services: # - ~/.aws:/home/ubuntu/.aws - ~/devbase:/work/devbase env_file: - - ${DEVBASE_ROOT}/.env + # devbase(PLAN35) 機密は環境変数で注入: - ${DEVBASE_ROOT}/.env - env - - .env + # devbase(PLAN35) 機密は環境変数で注入: - .env group_add: ["${DOCKER_GID}"] command: tail -f /dev/null working_dir: /work diff --git a/github_work_time/projects/github_work_time/compose.yml b/github_work_time/projects/github_work_time/compose.yml index 78b16d3..fd6c957 100644 --- a/github_work_time/projects/github_work_time/compose.yml +++ b/github_work_time/projects/github_work_time/compose.yml @@ -8,7 +8,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock env_file: - - ${DEVBASE_ROOT}/.env + # devbase(PLAN35) 機密は環境変数で注入: - ${DEVBASE_ROOT}/.env - env - .env group_add: ["${DOCKER_GID}"] diff --git a/md-specgen/projects/md-specgen/compose.yml b/md-specgen/projects/md-specgen/compose.yml index acaaef5..e1097df 100644 --- a/md-specgen/projects/md-specgen/compose.yml +++ b/md-specgen/projects/md-specgen/compose.yml @@ -7,7 +7,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock env_file: - - ${DEVBASE_ROOT}/.env + # devbase(PLAN35) 機密は環境変数で注入: - ${DEVBASE_ROOT}/.env - env - .env group_add: ["${DOCKER_GID}"] diff --git a/tmllib/projects/tmllib/compose.yml b/tmllib/projects/tmllib/compose.yml index 0f7839b..146480a 100644 --- a/tmllib/projects/tmllib/compose.yml +++ b/tmllib/projects/tmllib/compose.yml @@ -10,7 +10,7 @@ services: # AWS SSO使用時のみコメントを外してください: # - ~/.aws:/home/ubuntu/.aws env_file: - - ${DEVBASE_ROOT}/.env + # devbase(PLAN35) 機密は環境変数で注入: - ${DEVBASE_ROOT}/.env - env - .env group_add: ["${DOCKER_GID}"]