feat:DBのセットアップを待つようにdepends onを追加しました．同様の理由でヘルスチェックを追加しました．

su-its · Mar 2, 2024 · 31a3896 · 31a3896
1 parent 95e6481
commit 31a3896
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/typing-server/docker-compose.dev.yml b/typing-server/docker-compose.dev.yml
@@ -1,7 +1,8 @@
 services:
   api:
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     build:
       context: .
       dockerfile: Dockerfile
@@ -15,6 +16,12 @@ services:
     extra_hosts:
       - 'db:172.28.1.5'
   db:
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 10s
+      retries: 10
+      start_period: 30s
+
     image: mysql:8.3.0
     environment:
       MYSQL_DATABASE: typing-db

diff --git a/typing-server/docker-compose.yml b/typing-server/docker-compose.yml
@@ -1,5 +1,8 @@
 services:
   api:
+    depends_on:
+      db:
+        condition: service_healthy
     build:
       context: .
       dockerfile: Dockerfile
@@ -13,14 +16,20 @@ services:
     extra_hosts:
       - 'db:172.28.1.5'
   db:
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 10s
+      retries: 10
+      start_period: 30s
+
     image: mysql:8.3.0
     environment:
       MYSQL_DATABASE: typing-db
       MYSQL_USER: user
       MYSQL_PASSWORD: password
       MYSQL_ROOT_PASSWORD: password
     ports:
-      - "33061:3306"
+      - "3307:3306"
     volumes:
       - db-data:/var/lib/mysql
     networks: