Merge pull request #80 from HCDigitalScholarship/solr

Improve the solr situation
HCDigitalScholarship · Aug 18, 2023 · f18fa7f · f18fa7f
2 parents 1993283 + a58e17c
commit f18fa7f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/QI/settings.py b/QI/settings.py
@@ -89,20 +89,5 @@
 
 USE_TZ = True
 
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.8/howto/static-files/
-
-
-HAYSTACK_CONNECTIONS = {
-    'default': {
-        'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
-        'URL': "http://127.0.0.1:8984/solr/QIcore",
-        'ADMIN_URL': 'http://127.0.0.1:8984/solr/admin/cores',
-        # ...or for multicore...
-        # 'URL': 'http://127.0.0.1:8984/solr/mysite',
-    },
-}
-
 HAYSTACK_SEARCH_RESULTS_PER_PAGE = 100
 
diff --git a/QI/settings_docker.py b/QI/settings_docker.py
@@ -6,4 +6,11 @@
 
 ALLOWED_HOSTS = ['*']
 
-SECRET_KEY = os.environ.get('SECRET_KEY')
+SECRET_KEY = os.environ.get('SECRET_KEY')
+
+HAYSTACK_CONNECTIONS = {
+    'default': {
+        'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
+        'URL': os.environ.get('SOLR_URL'),
+    },
+}
diff --git a/compose-dev.yaml b/compose-dev.yaml
@@ -8,4 +8,16 @@ services:
     ports:
       - "8000:8000"
     environment:
-      - SECRET_KEY=1
+      - SECRET_KEY=1
+      - SOLR_URL=http://solr:8983/solr/pennstreaty
+    depends_on:
+      - solr
+  solr:
+    image: solr:9.3
+    ports:
+     - "8983:8983"
+    volumes:
+      - data:/var/solr
+    command: solr-precreate pennstreaty
+volumes:
+  data: