Use healthcheck instead of waisbrot/wait

keboola · Jul 10, 2024 · ee98cae · ee98cae
1 parent 1d3b8dd
commit ee98cae
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -75,7 +75,6 @@ jobs:
       - name: Run tests
         run: |
           export MYSQL_VERSION="${{ matrix.mysql }}"
-          docker-compose run wait
           docker-compose run app
 
   tests-in-kbc:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,6 +21,11 @@ services:
       - mysql-ssl
       - mysql-ssl:mysql-different-cn
       - sshproxy
+    depends_on:
+      mysql:
+        condition: service_healthy
+      mysql-ssl:
+        condition: service_healthy
 
   dev:
     <<: *app
@@ -38,6 +43,11 @@ services:
     environment:
       MYSQL_DATABASE: test
       MYSQL_ROOT_PASSWORD: rootpassword
+    healthcheck:
+      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   mysql-ssl:
     image: mysql:${MYSQL_VERSION}
@@ -49,6 +59,11 @@ services:
     environment:
       MYSQL_DATABASE: test
       MYSQL_ROOT_PASSWORD: rootpassword
+    healthcheck:
+      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   sshproxy:
     image: keboola/db-component-ssh-proxy:latest
@@ -57,14 +72,5 @@ services:
     links:
       - mysql
 
-  wait:
-    image: waisbrot/wait
-    depends_on:
-      - mysql
-      - mysql-ssl
-    environment:
-      - TARGETS=mysql:3306,mysql-ssl:3306
-      - TIMEOUT=200
-
 volumes:
   ssh-keys: