From 4f751b7e72e7682d4fb96b3020831ae2d47f23e3 Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Mon, 29 Apr 2024 13:43:50 -0400
Subject: [PATCH 1/2] ckan-dev needs db, solr, redis

---
 docker-compose.dev.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 48a08e73..aa97df6d 100755
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -13,6 +13,10 @@ services:
         - TZ=${TZ}
     env_file:
       - .env
+    links:
+      - db
+      - solr
+      - redis
     ports:
       - "0.0.0.0:${CKAN_PORT_HOST}:${CKAN_PORT}"
     volumes:

From bbcadaf920823fa04f79e356d845272f5741bd44 Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Mon, 29 Apr 2024 14:33:47 -0400
Subject: [PATCH 2/2] volume for pip cache, keep volumes

---
 docker-compose.dev.yml | 10 +++++++---
 docker-compose.yml     |  5 ++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index aa97df6d..b1a56a49 100755
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -2,6 +2,9 @@ volumes:
   ckan_storage:
   pg_data:
   solr_data:
+  pip_cache:
+  site_packages:
+  vscode_server:
 
 services:
 
@@ -22,12 +25,13 @@ services:
     volumes:
       - ckan_storage:/var/lib/ckan
       - ./src:/srv/app/src_extensions
-      - /usr/lib/python3.10/site-packages
-      - /root/.vscode-server
+      - pip_cache:/root/.cache/pip
+      - site_packages:/usr/lib/python3.10/site-packages
+      - vscode_server:/root/.vscode-server
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"]
-    
+
   datapusher:
     image: ckan/ckan-base-datapusher:${DATAPUSHER_VERSION}
     restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index 97ab43f4..e7c61970 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,8 @@ volumes:
   ckan_storage:
   pg_data:
   solr_data:
+  pip_cache:
+  site_packages:
 
 services:
 
@@ -40,7 +42,8 @@ services:
         condition: service_healthy
     volumes:
       - ckan_storage:/var/lib/ckan
-      - /usr/lib/python3.10/site-packages
+      - pip_cache:/root/.cache/pip
+      - site_packages:/usr/lib/python3.10/site-packages
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"]