From 7c995871b2d175a533a58b7c3068f9cb66a8aa19 Mon Sep 17 00:00:00 2001
From: spwoodcock <sam.woodcock@protonmail.com>
Date: Fri, 2 Aug 2024 11:07:00 +0100
Subject: [PATCH] build: separate odm compose from main file

---
 docker-compose.odm.yml | 74 ++++++++++++++++++++++++++++++++++++++++++
 docker-compose.yml     | 68 --------------------------------------
 2 files changed, 74 insertions(+), 68 deletions(-)
 create mode 100644 docker-compose.odm.yml

diff --git a/docker-compose.odm.yml b/docker-compose.odm.yml
new file mode 100644
index 00000000..b7fa108e
--- /dev/null
+++ b/docker-compose.odm.yml
@@ -0,0 +1,74 @@
+networks:
+  dtm-network:
+    name: dtm-network
+
+volumes:
+  odm-media:
+  odm-db-data:
+
+services:
+  odm-db:
+    image: docker.io/opendronemap/webodm_db:latest
+    container_name: odm-db
+    volumes:
+      - odm-db-data:/var/lib/postgresql/data:Z
+    ports:
+      - 5999:5432
+    networks:
+      - dtm-network
+    restart: unless-stopped
+    oom_score_adj: -100
+
+  odm-api:
+    image: docker.io/opendronemap/nodeodm:3.5.3
+    # This is hardcoded by default
+    hostname: webodm-node-odm-1
+    container_name: odm-api
+    networks:
+      - dtm-network
+    restart: unless-stopped
+    oom_score_adj: 500
+
+  odm-web:
+    image: docker.io/opendronemap/webodm_webapp:2.5.4
+    container_name: odm-web
+    entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-postgres.sh odm-db /webodm/wait-for-it.sh -t 0 odm-broker:6379 -- /webodm/start.sh\""
+    volumes:
+      - odm-media:/webodm/app/media:z
+    ports:
+      - "${WO_PORT}:8000"
+    depends_on:
+      odm-worker:
+        condition: service_started
+    env_file:
+      - .env
+    networks:
+      - dtm-network
+    restart: unless-stopped
+    oom_score_adj: 0
+
+  odm-broker:
+    image: docker.io/redis:7.0.10
+    container_name: odm-broker
+    networks:
+      - dtm-network
+    restart: unless-stopped
+    oom_score_adj: -500
+
+  odm-worker:
+    image: docker.io/opendronemap/webodm_webapp:2.5.4
+    container_name: odm-worker
+    entrypoint: /bin/bash -c "/webodm/wait-for-postgres.sh odm-db /webodm/wait-for-it.sh -t 0 odm-broker:6379 -- /webodm/wait-for-it.sh -t 0 odm-web:8000 -- /webodm/worker.sh start"
+    volumes:
+      - odm-media:/webodm/app/media:z
+    depends_on:
+      odm-db:
+        condition: service_started
+      odm-broker:
+        condition: service_started
+    env_file:
+      - .env
+    networks:
+      - dtm-network
+    restart: unless-stopped
+    oom_score_adj: 250
diff --git a/docker-compose.yml b/docker-compose.yml
index f70f8c73..c32cd5da 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,8 +5,6 @@ networks:
 volumes:
   db-data:
     name: drone-tm-db-data
-  odm-media:
-  odm-db-data:
 
 services:
   backend:
@@ -104,69 +102,3 @@ services:
       - dtm-network
     entrypoint: ["pdm", "run", "alembic", "upgrade", "head"]
     restart: "no"
-
-  odm-db:
-    image: docker.io/opendronemap/webodm_db:latest
-    container_name: odm-db
-    volumes:
-      - odm-db-data:/var/lib/postgresql/data:Z
-    ports:
-      - 5999:5432
-    networks:
-      - dtm-network
-    restart: unless-stopped
-    oom_score_adj: -100
-
-  odm-api:
-    image: docker.io/opendronemap/nodeodm:3.5.3
-    # This is hardcoded by default
-    hostname: webodm-node-odm-1
-    container_name: odm-api
-    networks:
-      - dtm-network
-    restart: unless-stopped
-    oom_score_adj: 500
-
-  odm-web:
-    image: docker.io/opendronemap/webodm_webapp:2.5.4
-    container_name: odm-web
-    entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-postgres.sh odm-db /webodm/wait-for-it.sh -t 0 odm-broker:6379 -- /webodm/start.sh\""
-    volumes:
-      - odm-media:/webodm/app/media:z
-    ports:
-      - "${WO_PORT}:8000"
-    depends_on:
-      odm-worker:
-        condition: service_started
-    env_file:
-      - .env
-    networks:
-      - dtm-network
-    restart: unless-stopped
-    oom_score_adj: 0
-
-  odm-broker:
-    image: docker.io/redis:7.0.10
-    container_name: odm-broker
-    networks:
-      - dtm-network
-    restart: unless-stopped
-    oom_score_adj: -500
-
-  odm-worker:
-    image: docker.io/opendronemap/webodm_webapp:2.5.4
-    container_name: odm-worker
-    entrypoint: /bin/bash -c "/webodm/wait-for-postgres.sh odm-db /webodm/wait-for-it.sh -t 0 odm-broker:6379 -- /webodm/wait-for-it.sh -t 0 odm-web:8000 -- /webodm/worker.sh start"
-    volumes:
-      - odm-media:/webodm/app/media:z
-    depends_on:
-      odm-db:
-        condition: service_started
-      odm-broker:
-        condition: service_started
-    env_file:
-      - .env
-    networks:
-      - dtm-network
-    restart: unless-stopped
-    oom_score_adj: 250