From b8c0efd35bcd2b79d4674426736ef234088e51b8 Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Wed, 7 Jan 2026 17:58:31 +0900 Subject: [PATCH 01/14] =?UTF-8?q?[add]schemaspy=E3=81=AE=E5=B0=8E=E5=85=A5?= =?UTF-8?q?=E3=80=81ER=E5=9B=B3=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +++ Makefile | 10 ++++++++ README.md | 13 ++++++++++ api/docs/schemaspy/.gitkeep | 2 ++ api/docs/schemaspy/README.md | 6 +++++ api/docs/schemaspy/schemaspy.properties | 17 +++++++++++++ docker-compose.mac.yml | 33 +++++++++++++++++++++++++ docker-compose.yml | 33 +++++++++++++++++++++++++ scripts/run_schemaspy.sh | 13 ++++++++++ 9 files changed, 131 insertions(+) create mode 100644 api/docs/schemaspy/.gitkeep create mode 100644 api/docs/schemaspy/README.md create mode 100644 api/docs/schemaspy/schemaspy.properties create mode 100755 scripts/run_schemaspy.sh diff --git a/.gitignore b/.gitignore index 33d78ee6..215facb2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,7 @@ api/lib/interface api/env/* api/seeds/* web/prod/* +api/docs/schemaspy/* +!api/docs/schemaspy/.gitkeep +!api/docs/schemaspy/schemaspy.properties +!api/docs/schemaspy/README.md diff --git a/Makefile b/Makefile index c7d2fbb1..b2e3fe75 100644 --- a/Makefile +++ b/Makefile @@ -85,6 +85,16 @@ mac-seed: sleep 15 docker compose -f docker-compose.mac.yml run --rm api go run /app/seeds/seeds.go +.PHONY: schemaspy +schemaspy: + mkdir -p api/docs/schemaspy + docker compose run --rm schemaspy + +.PHONY: mac-schemaspy +mac-schemaspy: + mkdir -p api/docs/schemaspy + docker compose -f docker-compose.mac.yml run --rm schemaspy + # mobile/lib/assetsに512*512のアイコンを用意しておくこと(コマンドのファイル名も変更する) # リサイズ用にImageMagickをインストールする（`sudo apt-get install imagemagick` or `brew install imagemagick`） .PHONY: mobile-icons-init diff --git a/README.md b/README.md index ea0f5353..66d47b31 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,19 @@ git submodule update --init ### diを編集してからうまく動かないとき 一度コンテナをdownさせてからupし直してみてください。 +## SchemaSpyでDBスキーマを確認する（PostgreSQL） +- DB初期データは `mysql/db` ディレクトリにありますが、実際のDBはPostgreSQLです。 +- 生成物の出力先: `api/docs/schemaspy` + +```fish +# 標準（docker-compose.yml） +make schemaspy + +# Mac用composeを使う場合 +make mac-schemaspy +``` +接続先・認証情報は compose の環境変数（`SCHEMASPY_HOST`, `SCHEMASPY_DB` など）で上書きできます。 + ## Author NUTMEG（技大祭実行委員会情報局） mail: nutfes.info [at] gmail diff --git a/api/docs/schemaspy/.gitkeep b/api/docs/schemaspy/.gitkeep new file mode 100644 index 00000000..139597f9 --- /dev/null +++ b/api/docs/schemaspy/.gitkeep @@ -0,0 +1,2 @@ + + diff --git a/api/docs/schemaspy/README.md b/api/docs/schemaspy/README.md new file mode 100644 index 00000000..93bacec4 --- /dev/null +++ b/api/docs/schemaspy/README.md @@ -0,0 +1,6 @@ +# SchemaSpy 出力先 + +- 生成物のHTMLはこのディレクトリに出力されます。 +- 設定テンプレート: `schemaspy.properties`（接続先はPostgreSQLを想定）。 +- `docker compose run --rm schemaspy` または `make schemaspy` で再生成できます。 + diff --git a/api/docs/schemaspy/schemaspy.properties b/api/docs/schemaspy/schemaspy.properties new file mode 100644 index 00000000..359a8343 --- /dev/null +++ b/api/docs/schemaspy/schemaspy.properties @@ -0,0 +1,17 @@ +# SchemaSpy configuration for SeeFT PostgreSQL +# メモ: リポジトリ内の mysql ディレクトリは初期データ置き場だが、実際のDBはPostgreSQL。 +schemaspy.t=pgsql +schemaspy.host=${SCHEMASPY_HOST:-db} +schemaspy.port=${SCHEMASPY_PORT:-5432} +schemaspy.db=${SCHEMASPY_DB:-seeft_db} +schemaspy.u=${SCHEMASPY_USER:-seeft} +schemaspy.p=${SCHEMASPY_PASSWORD:-password} +schemaspy.s=${SCHEMASPY_SCHEMA:-public} + +# 出力先は docker-compose のボリューム指定で /output にマウントされる +schemaspy.o=/output + +# 追加で必要な場合のサンプル +# schemaspy.meta=/output/meta.xml +# schemaspy.cat=public + diff --git a/docker-compose.mac.yml b/docker-compose.mac.yml index 01c8f4d2..913391c7 100644 --- a/docker-compose.mac.yml +++ b/docker-compose.mac.yml @@ -43,3 +43,36 @@ services: tty: true depends_on: [api] + schemaspy: + container_name: nutfes-seeft-schemaspy + image: schemaspy/schemaspy:latest + depends_on: + db: + condition: service_started + environment: + SCHEMASPY_HOST: ${SCHEMASPY_HOST:-db} + SCHEMASPY_PORT: ${SCHEMASPY_PORT:-5432} + SCHEMASPY_DB: ${SCHEMASPY_DB:-seeft_db} + SCHEMASPY_USER: ${SCHEMASPY_USER:-seeft} + SCHEMASPY_PASSWORD: ${SCHEMASPY_PASSWORD:-password} + SCHEMASPY_SCHEMA: ${SCHEMASPY_SCHEMA:-public} + volumes: + - ./api/docs/schemaspy:/output + command: + - "-t" + - "pgsql" + - "-host" + - "${SCHEMASPY_HOST:-db}" + - "-port" + - "${SCHEMASPY_PORT:-5432}" + - "-db" + - "${SCHEMASPY_DB:-seeft_db}" + - "-u" + - "${SCHEMASPY_USER:-seeft}" + - "-p" + - "${SCHEMASPY_PASSWORD:-password}" + - "-s" + - "${SCHEMASPY_SCHEMA:-public}" + - "-o" + - "/output" + diff --git a/docker-compose.yml b/docker-compose.yml index eb60dd3d..5230d2a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,4 +59,37 @@ services: tty: true depends_on: [api] + schemaspy: + container_name: nutfes-seeft-schemaspy + image: schemaspy/schemaspy:latest + depends_on: + db: + condition: service_started + environment: + SCHEMASPY_HOST: ${SCHEMASPY_HOST:-db} + SCHEMASPY_PORT: ${SCHEMASPY_PORT:-5432} + SCHEMASPY_DB: ${SCHEMASPY_DB:-seeft_db} + SCHEMASPY_USER: ${SCHEMASPY_USER:-seeft} + SCHEMASPY_PASSWORD: ${SCHEMASPY_PASSWORD:-password} + SCHEMASPY_SCHEMA: ${SCHEMASPY_SCHEMA:-public} + volumes: + - ./api/docs/schemaspy:/output + command: + - "-t" + - "pgsql" + - "-host" + - "${SCHEMASPY_HOST:-db}" + - "-port" + - "${SCHEMASPY_PORT:-5432}" + - "-db" + - "${SCHEMASPY_DB:-seeft_db}" + - "-u" + - "${SCHEMASPY_USER:-seeft}" + - "-p" + - "${SCHEMASPY_PASSWORD:-password}" + - "-s" + - "${SCHEMASPY_SCHEMA:-public}" + # - "-o" + # - "/output" + diff --git a/scripts/run_schemaspy.sh b/scripts/run_schemaspy.sh new file mode 100755 index 00000000..5c090acb --- /dev/null +++ b/scripts/run_schemaspy.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +set -euo pipefail + +ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)" +OUTPUT_DIR="${ROOT_DIR}/api/docs/schemaspy" + +mkdir -p "${OUTPUT_DIR}" + +# Docker Compose経由でSchemaSpyを実行するラッパー。 +# 接続先はPostgreSQL（サービス名 db）を前提にしている。 +cd "${ROOT_DIR}" +docker compose run --rm schemaspy "$@" + From 25a0073232f6fabcee48eaba9fc1cdb31f1fa044 Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Thu, 8 Jan 2026 14:46:40 +0900 Subject: [PATCH 02/14] =?UTF-8?q?[fix]=E4=B8=80=E5=BF=9Cschemaspy=E3=82=92?= =?UTF-8?q?gitignore=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 215facb2..93816dab 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ api/docs/schemaspy/* !api/docs/schemaspy/.gitkeep !api/docs/schemaspy/schemaspy.properties !api/docs/schemaspy/README.md + +# SchemaSpy +schemaspy/ \ No newline at end of file From a3d1ccd9227e26f8dc67c2c6e65f2937e60c767e Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Mon, 12 Jan 2026 01:05:25 +0900 Subject: [PATCH 03/14] =?UTF-8?q?[fix]schemaspy=E3=81=AE=E5=AE=9F=E8=A1=8C?= =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=82=92makefile=E3=81=AB?= =?UTF-8?q?=E7=B5=B1=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 ++-- scripts/run_schemaspy.sh | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100755 scripts/run_schemaspy.sh diff --git a/Makefile b/Makefile index b2e3fe75..0f52a0ab 100644 --- a/Makefile +++ b/Makefile @@ -88,12 +88,12 @@ mac-seed: .PHONY: schemaspy schemaspy: mkdir -p api/docs/schemaspy - docker compose run --rm schemaspy + docker compose run --rm schemaspy $(ARGS) .PHONY: mac-schemaspy mac-schemaspy: mkdir -p api/docs/schemaspy - docker compose -f docker-compose.mac.yml run --rm schemaspy + docker compose -f docker-compose.mac.yml run --rm schemaspy $(ARGS) # mobile/lib/assetsに512*512のアイコンを用意しておくこと(コマンドのファイル名も変更する) # リサイズ用にImageMagickをインストールする（`sudo apt-get install imagemagick` or `brew install imagemagick`） diff --git a/scripts/run_schemaspy.sh b/scripts/run_schemaspy.sh deleted file mode 100755 index 5c090acb..00000000 --- a/scripts/run_schemaspy.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)" -OUTPUT_DIR="${ROOT_DIR}/api/docs/schemaspy" - -mkdir -p "${OUTPUT_DIR}" - -# Docker Compose経由でSchemaSpyを実行するラッパー。 -# 接続先はPostgreSQL（サービス名 db）を前提にしている。 -cd "${ROOT_DIR}" -docker compose run --rm schemaspy "$@" - From 363fa5b195c1c370079c677e6088ef1517fab9e7 Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Tue, 13 Jan 2026 18:11:03 +0900 Subject: [PATCH 04/14] [add] Add profiles section for schemaspy service in docker-compose.yml --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 5230d2a9..250f25e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -74,6 +74,8 @@ services: SCHEMASPY_SCHEMA: ${SCHEMASPY_SCHEMA:-public} volumes: - ./api/docs/schemaspy:/output + profiles: + - tools command: - "-t" - "pgsql" From 462f193f98fe25e30a400fc22e8ea94f28aedc38 Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Tue, 13 Jan 2026 18:35:40 +0900 Subject: [PATCH 05/14] [fix]Remove version spwcification from compose file --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 250f25e4..b28aa43d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.8" + services: db: From 99d9365a2a7f3b1eaf25ee182f083d0f25b62f22 Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Wed, 18 Mar 2026 16:16:16 +0900 Subject: [PATCH 06/14] [refactor] Update schemaspy integration: remove old files and streamline ER diagram extraction --- .gitignore | 5 +---- Makefile | 14 ++++++++++++-- api/docs/schemaspy/.gitkeep | 2 -- api/docs/schemaspy/README.md | 6 ------ api/docs/schemaspy/schemaspy.properties | 17 ----------------- 5 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 api/docs/schemaspy/.gitkeep delete mode 100644 api/docs/schemaspy/README.md delete mode 100644 api/docs/schemaspy/schemaspy.properties diff --git a/.gitignore b/.gitignore index 93816dab..ce5cc932 100644 --- a/.gitignore +++ b/.gitignore @@ -26,10 +26,7 @@ api/lib/interface api/env/* api/seeds/* web/prod/* -api/docs/schemaspy/* -!api/docs/schemaspy/.gitkeep -!api/docs/schemaspy/schemaspy.properties -!api/docs/schemaspy/README.md +api/docs/er-diagrams/* # SchemaSpy schemaspy/ \ No newline at end of file diff --git a/Makefile b/Makefile index 0f52a0ab..78cf3ce5 100644 --- a/Makefile +++ b/Makefile @@ -88,12 +88,22 @@ mac-seed: .PHONY: schemaspy schemaspy: mkdir -p api/docs/schemaspy - docker compose run --rm schemaspy $(ARGS) + - docker compose run --rm schemaspy + @echo "Extracting ER diagrams..." + mkdir -p api/docs/er-diagrams + find api/docs/schemaspy/diagrams -name '*.png' -exec cp {} api/docs/er-diagrams/ \; + rm -rf api/docs/schemaspy + @echo "ER diagrams saved to api/docs/er-diagrams/" .PHONY: mac-schemaspy mac-schemaspy: mkdir -p api/docs/schemaspy - docker compose -f docker-compose.mac.yml run --rm schemaspy $(ARGS) + - docker compose run --rm schemaspy + @echo "Extracting ER diagrams..." + mkdir -p api/docs/er-diagrams + find api/docs/schemaspy/diagrams -name '*.png' -exec cp {} api/docs/er-diagrams/ \; + rm -rf api/docs/schemaspy + @echo "ER diagrams saved to api/docs/er-diagrams/" # mobile/lib/assetsに512*512のアイコンを用意しておくこと(コマンドのファイル名も変更する) # リサイズ用にImageMagickをインストールする（`sudo apt-get install imagemagick` or `brew install imagemagick`） diff --git a/api/docs/schemaspy/.gitkeep b/api/docs/schemaspy/.gitkeep deleted file mode 100644 index 139597f9..00000000 --- a/api/docs/schemaspy/.gitkeep +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api/docs/schemaspy/README.md b/api/docs/schemaspy/README.md deleted file mode 100644 index 93bacec4..00000000 --- a/api/docs/schemaspy/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# SchemaSpy 出力先 - -- 生成物のHTMLはこのディレクトリに出力されます。 -- 設定テンプレート: `schemaspy.properties`（接続先はPostgreSQLを想定）。 -- `docker compose run --rm schemaspy` または `make schemaspy` で再生成できます。 - diff --git a/api/docs/schemaspy/schemaspy.properties b/api/docs/schemaspy/schemaspy.properties deleted file mode 100644 index 359a8343..00000000 --- a/api/docs/schemaspy/schemaspy.properties +++ /dev/null @@ -1,17 +0,0 @@ -# SchemaSpy configuration for SeeFT PostgreSQL -# メモ: リポジトリ内の mysql ディレクトリは初期データ置き場だが、実際のDBはPostgreSQL。 -schemaspy.t=pgsql -schemaspy.host=${SCHEMASPY_HOST:-db} -schemaspy.port=${SCHEMASPY_PORT:-5432} -schemaspy.db=${SCHEMASPY_DB:-seeft_db} -schemaspy.u=${SCHEMASPY_USER:-seeft} -schemaspy.p=${SCHEMASPY_PASSWORD:-password} -schemaspy.s=${SCHEMASPY_SCHEMA:-public} - -# 出力先は docker-compose のボリューム指定で /output にマウントされる -schemaspy.o=/output - -# 追加で必要な場合のサンプル -# schemaspy.meta=/output/meta.xml -# schemaspy.cat=public - From df18e22ffe388d38e1bbb8d17850ad8986794b0e Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Wed, 18 Mar 2026 16:17:46 +0900 Subject: [PATCH 07/14] [refactor] Enhance schemaspy integration: organize ER diagram output and exclude specific files --- Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 78cf3ce5..b5d3cd89 100644 --- a/Makefile +++ b/Makefile @@ -88,23 +88,26 @@ mac-seed: .PHONY: schemaspy schemaspy: mkdir -p api/docs/schemaspy - - docker compose run --rm schemaspy - @echo "Extracting ER diagrams..." - mkdir -p api/docs/er-diagrams - find api/docs/schemaspy/diagrams -name '*.png' -exec cp {} api/docs/er-diagrams/ \; + docker compose run --rm schemaspy + mkdir -p api/docs/er-diagrams/summary + find api/docs/schemaspy/diagrams -name '*.png' ! -name 'relationships.real.*' -exec cp {} api/docs/er-diagrams/ \; + cp api/docs/schemaspy/diagrams/summary/relationships.real.compact.png api/docs/er-diagrams/summary/ + cp api/docs/schemaspy/diagrams/summary/relationships.real.large.png api/docs/er-diagrams/summary/ rm -rf api/docs/schemaspy @echo "ER diagrams saved to api/docs/er-diagrams/" .PHONY: mac-schemaspy mac-schemaspy: mkdir -p api/docs/schemaspy - - docker compose run --rm schemaspy - @echo "Extracting ER diagrams..." - mkdir -p api/docs/er-diagrams - find api/docs/schemaspy/diagrams -name '*.png' -exec cp {} api/docs/er-diagrams/ \; + docker compose run --rm schemaspy + mkdir -p api/docs/er-diagrams/summary + find api/docs/schemaspy/diagrams -name '*.png' ! -name 'relationships.real.*' -exec cp {} api/docs/er-diagrams/ \; + cp api/docs/schemaspy/diagrams/summary/relationships.real.compact.png api/docs/er-diagrams/summary/ + cp api/docs/schemaspy/diagrams/summary/relationships.real.large.png api/docs/er-diagrams/summary/ rm -rf api/docs/schemaspy @echo "ER diagrams saved to api/docs/er-diagrams/" + # mobile/lib/assetsに512*512のアイコンを用意しておくこと(コマンドのファイル名も変更する) # リサイズ用にImageMagickをインストールする（`sudo apt-get install imagemagick` or `brew install imagemagick`） .PHONY: mobile-icons-init From 8ac5c1bf1c38e08450539ac295452fc6f527e7a0 Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Fri, 17 Apr 2026 01:04:45 +0900 Subject: [PATCH 08/14] =?UTF-8?q?feat:=20CodeRabbit=E3=82=92=E6=97=A5?= =?UTF-8?q?=E6=9C=AC=E8=AA=9E=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .coderabbit.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .coderabbit.yaml diff --git a/.coderabbit.yaml b/.coderabbit.yaml new file mode 100644 index 00000000..90ea0b2f --- /dev/null +++ b/.coderabbit.yaml @@ -0,0 +1,3 @@ +language: "ja-JP" +reviews: + profile: "concise" From f85b6ae8f954cf5aa048316ecf57081969680fb2 Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Fri, 17 Apr 2026 01:08:11 +0900 Subject: [PATCH 09/14] =?UTF-8?q?fix:=20CodeRabbitAI=E3=81=AE=E6=97=A5?= =?UTF-8?q?=E6=9C=AC=E8=AA=9E=E5=8C=96=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .coderabbit.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.coderabbit.yaml b/.coderabbit.yaml index 90ea0b2f..6399f304 100644 --- a/.coderabbit.yaml +++ b/.coderabbit.yaml @@ -1,3 +1,7 @@ -language: "ja-JP" +language: ja-JP reviews: - profile: "concise" + profile: concise + auto_review: + enabled: true +chat: + auto_reply: true From 7bd216e24d593cc2756bf4a2c47cd5d4d93e5e7b Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Fri, 17 Apr 2026 01:13:59 +0900 Subject: [PATCH 10/14] =?UTF-8?q?fix:=20CodeRabbit=E3=81=AEprofile?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .coderabbit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.coderabbit.yaml b/.coderabbit.yaml index 6399f304..35ab409c 100644 --- a/.coderabbit.yaml +++ b/.coderabbit.yaml @@ -1,6 +1,6 @@ language: ja-JP reviews: - profile: concise + profile: chill auto_review: enabled: true chat: From 792136c6b9689ad001e2e2420d9b29411c4a762d Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Fri, 17 Apr 2026 08:17:36 +0900 Subject: [PATCH 11/14] =?UTF-8?q?fix:=20giiignore=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ce5cc932..273de361 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,4 @@ web/prod/* api/docs/er-diagrams/* # SchemaSpy -schemaspy/ \ No newline at end of file +api/docs/schemaspy/ \ No newline at end of file From 7a59c92d923e7c9031db538fd3ecce5a770ede31 Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Fri, 17 Apr 2026 08:25:40 +0900 Subject: [PATCH 12/14] =?UTF-8?q?fix:=20healthcheck=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.mac.yml | 7 ++++++- docker-compose.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docker-compose.mac.yml b/docker-compose.mac.yml index 913391c7..d6ec2f0b 100644 --- a/docker-compose.mac.yml +++ b/docker-compose.mac.yml @@ -12,6 +12,11 @@ services: POSTGRES_USER: seeft POSTGRES_PASSWORD: password TZ: 'Asia/Tokyo' + healthcheck: + test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"] + interval: 5s + timeout: 5s + retries: 10 ports: - 5432:5432 @@ -48,7 +53,7 @@ services: image: schemaspy/schemaspy:latest depends_on: db: - condition: service_started + condition: service_healthy environment: SCHEMASPY_HOST: ${SCHEMASPY_HOST:-db} SCHEMASPY_PORT: ${SCHEMASPY_PORT:-5432} diff --git a/docker-compose.yml b/docker-compose.yml index b28aa43d..a561f2b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,11 @@ services: POSTGRES_USER: seeft POSTGRES_PASSWORD: password TZ: 'Asia/Tokyo' + healthcheck: + test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"] + interval: 5s + timeout: 5s + retries: 10 ports: - 5432:5432 @@ -64,7 +69,7 @@ services: image: schemaspy/schemaspy:latest depends_on: db: - condition: service_started + condition: service_healthy environment: SCHEMASPY_HOST: ${SCHEMASPY_HOST:-db} SCHEMASPY_PORT: ${SCHEMASPY_PORT:-5432} From 61f09af6cad1761b2bdf84cece8c3e4a2d7798b2 Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Fri, 17 Apr 2026 08:38:58 +0900 Subject: [PATCH 13/14] =?UTF-8?q?fix:=20README=E3=81=AEpath=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 66d47b31..80d8b4c3 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,8 @@ git submodule update --init ## SchemaSpyでDBスキーマを確認する（PostgreSQL） - DB初期データは `mysql/db` ディレクトリにありますが、実際のDBはPostgreSQLです。 -- 生成物の出力先: `api/docs/schemaspy` +- 最終生成物の出力先: `api/docs/er-diagrams/` +- 一時出力先: `api/docs/schemaspy`（処理後に削除） ```fish # 標準（docker-compose.yml） From 7a1af9c4e513037e2f65b6350e11ab21f04bd81e Mon Sep 17 00:00:00 2001 From: taminororo <169162271+taminororo@users.noreply.github.com> Date: Mon, 20 Apr 2026 20:31:04 +0900 Subject: [PATCH 14/14] =?UTF-8?q?fix:=20postgres=E3=82=A4=E3=83=A1?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=82=92=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B318=E3=81=AB=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.mac.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.mac.yml b/docker-compose.mac.yml index d6ec2f0b..ffdec508 100644 --- a/docker-compose.mac.yml +++ b/docker-compose.mac.yml @@ -3,7 +3,7 @@ version: "3.8" services: db: container_name: nutfes-seeft-db - image: postgres + image: postgres:18 volumes: - ./mysql/db:/docker-entrypoint-initdb.d/ # 初期データ - ./my.cnf:/etc/mysql/conf.d/my.cnf diff --git a/docker-compose.yml b/docker-compose.yml index a561f2b1..48cbec8b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: db: container_name: nutfes-seeft-db - image: postgres + image: postgres:18 volumes: - ./mysql/db:/docker-entrypoint-initdb.d/ # 初期データ - ./my.cnf:/etc/mysql/conf.d/my.cnf