From cee07267f7bc5380e27d4951c5dd5e49e0a47a86 Mon Sep 17 00:00:00 2001
From: spwoodcock <sam.woodcock@protonmail.com>
Date: Wed, 30 Oct 2024 12:46:30 +0000
Subject: [PATCH] build: update node and web ODM versions, document compose
 file

---
 docker-compose.odm.yml | 49 +++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/docker-compose.odm.yml b/docker-compose.odm.yml
index b7fa108e..e787e401 100644
--- a/docker-compose.odm.yml
+++ b/docker-compose.odm.yml
@@ -7,18 +7,7 @@ volumes:
   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
-
+  # This container does the actual imagery processing (not persistent, scalable)
   odm-api:
     image: docker.io/opendronemap/nodeodm:3.5.3
     # This is hardcoded by default
@@ -29,8 +18,9 @@ services:
     restart: unless-stopped
     oom_score_adj: 500
 
+  # UI to coordinate queueing of tasks and display of output
   odm-web:
-    image: docker.io/opendronemap/webodm_webapp:2.5.4
+    image: docker.io/opendronemap/webodm_webapp:2.5.5
     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:
@@ -47,16 +37,9 @@ services:
     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
-
+  # Instance of WebODM that uses Celery to manage processing jobs
   odm-worker:
-    image: docker.io/opendronemap/webodm_webapp:2.5.4
+    image: docker.io/opendronemap/webodm_webapp:2.5.5
     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:
@@ -72,3 +55,25 @@ services:
       - dtm-network
     restart: unless-stopped
     oom_score_adj: 250
+
+  # Redis broker to manage job queue
+  odm-broker:
+    image: docker.io/redis:7.4.1
+    container_name: odm-broker
+    networks:
+      - dtm-network
+    restart: unless-stopped
+    oom_score_adj: -500
+
+  # Stores data related to the web instance & queueing
+  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