From 2329fd9ac8548f2966cbcd90662c8fa87e2a012b Mon Sep 17 00:00:00 2001
From: liamcottle <liam@liamcottle.com>
Date: Sat, 15 Jun 2024 14:39:49 +1200
Subject: [PATCH] use docker service healthy condition instead of external
 docker-compose-wait dependency

---
 docker/Dockerfile         | 2 --
 docker/docker-compose.yml | 8 ++++----
 docker/map.sh             | 3 ---
 docker/mqtt.sh            | 3 ---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e5d35de..80ca899 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,5 @@
 FROM node:lts-alpine
 
-COPY --from=ghcr.io/ufoscout/docker-compose-wait:latest /wait /wait
-
 ADD ./ /app
 WORKDIR /app
 RUN npm install
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f0294c7..3418851 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,21 +4,22 @@ services:
   meshtastic-mqtt:
     container_name: meshtastic-mqtt
     depends_on:
-      - database
+      database:
+        condition: service_healthy
     build:
       context: ..
       dockerfile: docker/Dockerfile
     command: /app/docker/mqtt.sh
     environment:
       DATABASE_URL: "mysql://root:password@database:3306/meshtastic-map?connection_limit=100"
-      WAIT_HOSTS: "database:3306"
       MQTT_OPTS: "" # add any custom mqtt.js options here
 
   # runs the web map ui
   meshtastic-map:
     container_name: meshtastic-map
     depends_on:
-      - database
+      database:
+        condition: service_healthy
     build:
       context: ..
       dockerfile: docker/Dockerfile
@@ -27,7 +28,6 @@ services:
       - 8080:8080/tcp
     environment:
       DATABASE_URL: "mysql://root:password@database:3306/meshtastic-map?connection_limit=100"
-      WAIT_HOSTS: "database:3306"
       MAP_OPTS: "" # add any custom index.js options here
 
   # runs the database to store everything from mqtt
diff --git a/docker/map.sh b/docker/map.sh
index 9d061d5..d23111f 100755
--- a/docker/map.sh
+++ b/docker/map.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-echo "Waiting for mysql"
-/wait || exit 111
-
 echo "Running migrations"
 npx prisma migrate dev
 
diff --git a/docker/mqtt.sh b/docker/mqtt.sh
index 454435b..815cd88 100755
--- a/docker/mqtt.sh
+++ b/docker/mqtt.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-echo "Waiting for mysql"
-/wait || exit 111
-
 echo "Running migrations"
 npx prisma migrate dev