From 7f10ec167d9b52eb7020d19654570379b59d783b Mon Sep 17 00:00:00 2001
From: h-takeyeah <61489178+h-takeyeah@users.noreply.github.com>
Date: Sat, 9 Mar 2024 18:53:59 +0900
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20DB=20=E3=81=AE=E3=82=A2=E3=83=89?=
 =?UTF-8?q?=E3=83=AC=E3=82=B9=E3=82=92=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0?=
 =?UTF-8?q?=E3=81=A7=E6=8C=87=E5=AE=9A=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typing-server/api/cmd/main.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/typing-server/api/cmd/main.go b/typing-server/api/cmd/main.go
index 82272b59..3a9ad5b6 100644
--- a/typing-server/api/cmd/main.go
+++ b/typing-server/api/cmd/main.go
@@ -25,15 +25,20 @@ func main() {
 		return
 	}
 
+	var addr = os.Getenv("DB_ADDR")
+	if addr == "" {
+		addr = "db:3306" // アドレス（Docker Compose内でのサービス名とポート）
+	}
+
 	// MySQLの接続設定
 	mysqlConfig := &mysql.Config{
 		DBName:    "typing-db", // データベース名
 		User:      "user",      // ユーザー名
 		Passwd:    "password",  // パスワード
 		Net:       "tcp",       // ネットワークタイプ
-		Addr:      "db:3306",   // アドレス（Docker Compose内でのサービス名とポート）
-		ParseTime: true,        // 時刻をtime.Timeで解析する
-		Loc:       jst,         // タイムゾーン
+		Addr:      addr,
+		ParseTime: true, // 時刻をtime.Timeで解析する
+		Loc:       jst,  // タイムゾーン
 	}
 
 	// entクライアントの初期化

From ca02da7d79a9a77c6446ff715477ad90c6e0faad Mon Sep 17 00:00:00 2001
From: h-takeyeah <61489178+h-takeyeah@users.noreply.github.com>
Date: Sun, 10 Mar 2024 13:11:35 +0900
Subject: [PATCH 2/2] =?UTF-8?q?build[docker-compose]:=20DB=5FADDR=E3=82=92?=
 =?UTF-8?q?=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0=E3=81=AB=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

デフォルトで db:3306 がセットされます。
---
 typing-server/docker-compose.dev.yml | 2 ++
 typing-server/docker-compose.yml     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/typing-server/docker-compose.dev.yml b/typing-server/docker-compose.dev.yml
index 629343f1..c8beb76d 100644
--- a/typing-server/docker-compose.dev.yml
+++ b/typing-server/docker-compose.dev.yml
@@ -8,6 +8,8 @@ services:
       dockerfile: Dockerfile
     volumes:
       - ./api:/app
+    environment:
+      DB_ADDR: ${DB_ADDR:-db:3306}
     ports:
       - "8080:8080"
     networks:
diff --git a/typing-server/docker-compose.yml b/typing-server/docker-compose.yml
index 629343f1..c8beb76d 100644
--- a/typing-server/docker-compose.yml
+++ b/typing-server/docker-compose.yml
@@ -8,6 +8,8 @@ services:
       dockerfile: Dockerfile
     volumes:
       - ./api:/app
+    environment:
+      DB_ADDR: ${DB_ADDR:-db:3306}
     ports:
       - "8080:8080"
     networks: