Merge pull request #6 from TNRIS/bb-dev

TWDH 0.5.0 Changes
TNRIS · Dec 6, 2023 · 70ccf60 · 70ccf60
2 parents 19cabea + 93b380f
commit 70ccf60
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 24 deletions.
diff --git a/docker/.env-ckan.env b/docker/.env-ckan.env
@@ -41,7 +41,7 @@ CKAN__AUTH__CREATE_USER_VIA_WEB=false
 CKAN__TRACKING_ENABLED=true
 
 # Spatial Settings
-CKANEXT__SPATIAL__SEARCH_BACKEND=solr
+CKANEXT__SPATIAL__SEARCH_BACKEND=solr-bbox
 
 # CKAN requires storage path to be set in order for filestore to be enabled
 CKAN__STORAGE_PATH=/srv/app/data

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
@@ -82,7 +82,7 @@ FROM ubuntu:focal-20210827
 
 ARG GH_TOKEN=default
 
-LABEL maintainer="Texas Natural Resources Information Systems"
+LABEL maintainer="Texas Geographic Information Office"
 LABEL org.opencontainers.image.source https://github.com/tnris/twdh_ckan_docker
 
 # Set timezone
@@ -146,11 +146,14 @@ ENV CKAN__PLUGINS \
     datatablesview_plus \
     datapusher \
     openapi_viewer \
-    #googleanalytics \
     s3filestore \
-    envvars \ 
-    ags_fs_view
-
+    googleanalytics \
+    ags_fs_view \ 
+    twdh_gazetteer \
+    envvars 
+    # ^ envvars always needs to be last in the CKAN__PLUGINS list
+    # s3filestore MUST PRECEDE googlealanalytics in the CKAN_PLUGINS list
+
 # s3filestore env variables
 ENV CKANEXT__S3FILESTORE__AWS_BUCKET_NAME twdh-s3filestore
 ENV CKANEXT__S3FILESTORE__SIGNATURE_VERSION s3v4
@@ -254,11 +257,11 @@ RUN ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}"
     ckan config-tool ${APP_DIR}/production.ini "scheming.organization_schemas = ckanext.twdh_schema:schemas/organization.yaml" && \
     ckan config-tool ${APP_DIR}/production.ini "scheming.presets = ckanext.scheming:presets.json ckanext.composite:presets.json ckanext.twdh_schema:schemas/presets.yaml" && \
     # add ckan.spatial.search_backend to enable solr spatial search
-    ckan config-tool ${APP_DIR}/production.ini "ckanext.spatial.search_backend = solr" && \
+    ckan config-tool ${APP_DIR}/production.ini "ckanext.spatial.search_backend = solr-bbox" && \
     # change default logo to tx water logo from cdn.tnris.org
     ckan config-tool ${APP_DIR}/production.ini "ckan.site_logo = https://cdn.tnris.org/images/Hub_NavIcon_dark.png" && \
     # add config option for google analytics download view
-    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = UA-491601-18" && \
+    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = G-SJK5R9G5F5" && \
     ckan config-tool ${APP_DIR}/production.ini "googleanalytics.download_handler = ckanext.s3filestore.views:resource_download" && \
     # Change ownership to app user
     chown -R ckan:ckan /srv/app

diff --git a/docker/ckan/afterinit.d/02_datatables.sh b/docker/ckan/afterinit.d/02_datatables.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "@@@@@@ INIT SECURITY @@@@@@"
+ckan -c /srv/app/production.ini datatablesview-plus migrate
diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
@@ -3,7 +3,7 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_theme",
-      "tag": "TWDHv0.4.0.rc11",
+      "tag": "TWDHv0.5.0.rc1",
       "branch": "",
       "cmd": [
         "pip install -e .",
@@ -14,14 +14,21 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_schema",
-      "tag": "TWDHv0.3.2-20230809",
-      "branch": "main",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": ["pip install -e .", "pip install -r requirements.txt"]
     },
+    {
+      "owner": "TNRIS",
+      "repo": "ckanext-twdh_gazetteer",
+      "tag": "TWDHv0.4.1.rc3",
+      "branch": "",
+      "cmd": ["pip install -e ."]
+    },
     {
       "owner": "TNRIS",
       "repo": "ckanext-spatial",
-      "tag": "v1.1.0",
+      "tag": "TWDHv0.5.0.rc1",
       "branch": "",
       "cmd": [
         "pip install -e .",
@@ -37,9 +44,9 @@
       "cmd": ["python setup.py install"]
     },
     {
-      "owner": "TNRIS",
+      "owner": "ckan",
       "repo": "ckanext-scheming",
-      "tag": "TWDHv0.2.6",
+      "tag": "",
       "branch": "master",
       "cmd": ["pip install -e ."]
     },
@@ -53,15 +60,15 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-pages",
-      "tag": "TWDHv0.2.6",
-      "branch": "master",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": ["pip install -e .", "pip install -r requirements.txt"]
     },
     {
       "owner": "TNRIS",
       "repo": "ckanext-contact",
-      "tag": "TWDHv0.4.0.rc9",
-      "branch": "main",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": ["pip install -r requirements.txt", "python setup.py develop"]
     },
     {
@@ -81,7 +88,7 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-datatablesview_plus",
-      "tag": "TWDHv0.4.0.rc1",
+      "tag": "TWDHv0.5.0.rc1",
       "branch": "",
       "cmd": [
         "python setup.py install",
@@ -90,10 +97,10 @@
       ]
     },
     {
-      "owner": "keitaroinc",
+      "owner": "TNRIS",
       "repo": "ckanext-googleanalytics",
-      "tag": "",
-      "branch": "master",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": ["python setup.py install", "pip install -r requirements.txt"]
     },
     {
@@ -120,7 +127,7 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-check-link",
-      "tag": "TWDHv0.4.0.rc1",
+      "tag": "TWDHv0.5.0.rc1",
       "branch": "",
       "cmd": ["python setup.py install", "pip install -r dev-requirements.txt"]
     },

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -9,7 +9,7 @@ services:
   ckan:
     container_name: ckan
     hostname: ckan
-    image: 746466009731.dkr.ecr.us-east-1.amazonaws.com/29_ckan:v2.9.9-twdh-0.4.0.rc1
+    image: 746466009731.dkr.ecr.us-east-1.amazonaws.com/29_ckan:v2.9.9-dev-twdh-0.4.2.20231023
     networks:
       - frontend
       - backend