refactor docker compose

docker/docker-compose.yml

@@ -1,41 +1,46 @@
 services:
+
+  # listens to mqtt packets and saves to database
   meshtastic-mqtt:
     container_name: meshtastic-mqtt
     depends_on:
-      - mariadb
+      - database
     build:
       context: ..
       dockerfile: docker/Dockerfile
     command: /app/docker/mqtt.sh
-    links:
+    environment:
-      - mariadb
+      DATABASE_URL: "mysql://root:password@database:3306/meshtastic-map?connection_limit=100"
-    env_file:
+      WAIT_HOSTS: "database:3306"
-      - ../.env
+      MQTT_OPTS: "" # add any custom mqtt.js options here
 
-  meshmap:
+  # runs the web map ui
-    container_name: meshmap
+  meshtastic-map:
+    container_name: meshtastic-map
     depends_on:
-      - mariadb
+      - database
     build:
       context: ..
       dockerfile: docker/Dockerfile
-    command: /app/docker/webapp.sh
+    command: /app/docker/map.sh
     ports:
       - 8080:8080/tcp
-    links:
+    environment:
-      - mariadb
+      DATABASE_URL: "mysql://root:password@database:3306/meshtastic-map?connection_limit=100"
-    env_file:
+      WAIT_HOSTS: "database:3306"
-      - ../.env
+      MAP_OPTS: "" # add any custom index.js options here
 
-  mariadb:
+  # runs the database to store everything from mqtt
-    container_name: mariadb
+  database:
+    container_name: database
     image: bitnami/mariadb
     ports:
       - 3306:3306/tcp
-    env_file:
+    environment:
-      - ../.env
+      MARIADB_DATABASE: "meshtastic-map"
+      MARIADB_ROOT_PASSWORD: "password"
     volumes:
-      - mariadb_data:/bitnami/mariadb
+      - database_data:/bitnami/mariadb
     healthcheck:
       test: ['CMD', '/opt/bitnami/scripts/mariadb/healthcheck.sh']
       interval: 15s
@@ -44,4 +49,4 @@ services:
       start_interval: 5s
 
 volumes:
-  mariadb_data:
+  database_data:

docker/map.sh

@@ -6,5 +6,5 @@ echo "Waiting for mysql"
 echo "Running migrations"
 npx prisma migrate dev
 
-echo "Starting webapp"
+echo "Starting map ui"
-exec node src/index.js
+exec node src/index.js ${MAP_OPTS}

docker/mqtt.sh

@@ -7,4 +7,4 @@ echo "Running migrations"
 npx prisma migrate dev
 
 echo "Starting mqtt listener"
-exec node src/mqtt.js ${MESHMAP_MQTT_OPTS}
+exec node src/mqtt.js ${MQTT_OPTS}