From 60a9d301563d66f9a393734d461a9011939c3e56 Mon Sep 17 00:00:00 2001
From: Brett <brett@kowh.ai>
Date: Fri, 10 Dec 2021 14:35:25 +0100
Subject: [PATCH] env stuff

---
 .env               | 19 +++++++++++++------
 docker-compose.yml |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index a3d9300..864d5d4 100644
--- a/.env
+++ b/.env
@@ -28,16 +28,23 @@ CKAN_SMTP_PASSWORD=pass
 CKAN_SMTP_MAIL_FROM=ckan@localhost
 TZ=UTC
 
-# Other services
+# Solr
+SOLR_VERSION=6.6.6
 CKAN_SOLR_URL=http://solr:8983/solr/ckan
-CKAN_REDIS_URL=redis://redis:6379/1
-CKAN_DATAPUSHER_URL=http://datapusher:8801
-CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
-
-# test connections
 TEST_CKAN_SOLR_URL=http://solr:8983/solr/ckan
+
+# Redis
+REDIS_VERSION=6.0.7
+CKAN_REDIS_URL=redis://redis:6379/1
 TEST_CKAN_REDIS_URL=redis://redis:6379/1
 
+# Datapusher
+DATAPUSHER_VERSION=0.0.17
+CKAN_DATAPUSHER_URL=http://datapusher:8800
+CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
+DATAPUSHER_REWRITE_RESOURCES=True
+DATAPUSHER_REWRITE_URL=http://ckan:5000  
+
 # Extensions
 CKAN__PLUGINS=envvars image_view text_view recline_view datastore datapusher
 CKAN__HARVEST__MQ__TYPE=redis
diff --git a/docker-compose.yml b/docker-compose.yml
index b2f5aa1..d140bda 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,7 +60,7 @@ services:
 
   redis:
     container_name: redis
-    image: redis:alpine
+    image: redis:${REDIS_VERSION}
 
 volumes:
   ckan_storage: