From c55f85c701909a385910d3b736295a94a7b8b5d1 Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Thu, 16 Jul 2026 17:10:35 -0700
Subject: [PATCH] Refactor Docker compose configuration and add requirements
 file for mida image

---
 Taskfile.yml            |   2 +-
 docker/compose.yml      | 106 +++++++++++++++++++++++++++++++++-------
 docker/requirements.txt |   2 +
 3 files changed, 90 insertions(+), 20 deletions(-)
 create mode 100644 docker/requirements.txt

diff --git a/Taskfile.yml b/Taskfile.yml
index 750005c..6eeef04 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -2,7 +2,7 @@ version: "3"
 
 vars:
   CORE: ../../madrona-portal
-  COMPOSE: docker compose -f {{.CORE}}/docker/compose.base.yml -f docker/compose.yml --env-file docker/.env
+  COMPOSE: docker compose -f docker/compose.yml -f {{.CORE}}/docker/compose.base.yml --env-file docker/.env
 
 tasks:
   base:
diff --git a/docker/compose.yml b/docker/compose.yml
index f016ab5..817caff 100644
--- a/docker/compose.yml
+++ b/docker/compose.yml
@@ -2,8 +2,8 @@ services:
   app:
     image: wcoa-portal:dev
     build:
-      context: ..
-      dockerfile: docker/Dockerfile
+      context: ../../
+      dockerfile: madrona-apps/wcoa/docker/Dockerfile
       args:
         BASE_TAG: ${BASE_TAG:-latest}
     env_file:
@@ -13,23 +13,91 @@ services:
     volumes:
       - ./static:/vol/web/static
       - ./media:/usr/local/apps/madrona-portal/media
-      - ../../../madrona-portal/marco:/usr/local/apps/madrona-portal/marco
-      - ..:/usr/local/apps/madrona-portal/apps/wcoa
-      - ../../mp-data-manager:/usr/local/apps/madrona-portal/apps/mp-data-manager
-      - ../../mp-layers:/usr/local/apps/madrona-portal/apps/mp-layers
-      - ../../mp-accounts:/usr/local/apps/madrona-portal/apps/mp-accounts
-      - ../../mp-drawing:/usr/local/apps/madrona-portal/apps/mp-drawing
-      - ../../mp-visualize:/usr/local/apps/madrona-portal/apps/mp-visualize
-      - ../../madrona-features:/usr/local/apps/madrona-portal/apps/madrona-features
-      - ../../madrona-manipulators:/usr/local/apps/madrona-portal/apps/madrona-manipulators
-      - ../../madrona-scenarios:/usr/local/apps/madrona-portal/apps/madrona-scenarios
-      - ../../mp-map-groups:/usr/local/apps/madrona-portal/apps/mp-map-groups
-      - ../../mp-explore:/usr/local/apps/madrona-portal/apps/mp-explore
-      - ../../mp-proxy:/usr/local/apps/madrona-portal/apps/mp-proxy
-      - ../../p97-nursery:/usr/local/apps/madrona-portal/apps/p97-nursery
-      - ../../django_url_shortener:/usr/local/apps/madrona-portal/apps/django_url_shortener
-      - ../../madrona-analysistools:/usr/local/apps/madrona-portal/apps/madrona-analysistools
-      - ../../mp-survey:/usr/local/apps/madrona-portal/apps/mp-survey
+      - type: bind
+        source: ../../../madrona-portal/marco
+        target: /usr/local/apps/madrona-portal/marco
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ..
+        target: /usr/local/apps/madrona-portal/apps/wcoa
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../mp-data-manager
+        target: /usr/local/apps/madrona-portal/apps/mp-data-manager
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../mp-layers
+        target: /usr/local/apps/madrona-portal/apps/mp-layers
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../mp-accounts
+        target: /usr/local/apps/madrona-portal/apps/mp-accounts
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../mp-drawing
+        target: /usr/local/apps/madrona-portal/apps/mp-drawing
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../mp-visualize
+        target: /usr/local/apps/madrona-portal/apps/mp-visualize
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../madrona-features
+        target: /usr/local/apps/madrona-portal/apps/madrona-features
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../madrona-manipulators
+        target: /usr/local/apps/madrona-portal/apps/madrona-manipulators
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../madrona-scenarios
+        target: /usr/local/apps/madrona-portal/apps/madrona-scenarios
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../mp-map-groups
+        target: /usr/local/apps/madrona-portal/apps/mp-map-groups
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../mp-explore
+        target: /usr/local/apps/madrona-portal/apps/mp-explore
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../mp-proxy
+        target: /usr/local/apps/madrona-portal/apps/mp-proxy
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../p97-nursery
+        target: /usr/local/apps/madrona-portal/apps/p97-nursery
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../django_url_shortener
+        target: /usr/local/apps/madrona-portal/apps/django_url_shortener
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../madrona-analysistools
+        target: /usr/local/apps/madrona-portal/apps/madrona-analysistools
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ../../mp-survey
+        target: /usr/local/apps/madrona-portal/apps/mp-survey
+        bind:
+          create_host_path: false
 
   geoportal:
     image: tomcat:9-jdk11
diff --git a/docker/requirements.txt b/docker/requirements.txt
new file mode 100644
index 0000000..045cd20
--- /dev/null
+++ b/docker/requirements.txt
@@ -0,0 +1,2 @@
+# Project-only Python dependencies for mida Docker image.
+# Leave empty unless mida requires packages not already in the base image.
\ No newline at end of file