Merge pull request #864 from UN-OCHA/release-versions/v1.6.4

release versions/v1.6.4
UN-OCHA · Dec 7, 2023 · aba7c11 · aba7c11
2 parents 65d7612 + 7926985
commit aba7c11
Show file tree

Hide file tree

Showing 71 changed files with 2,487 additions and 267 deletions.
diff --git a/.docksal/commands/solr b/.docksal/commands/solr
@@ -15,7 +15,7 @@
 #   $SOLR_PORT -- (integer) the port
 #   $SOLR_CORE -- (string) the core name
 
-usage="$(basename "$0") [-h] create-core|index|dashboard
+usage="$(basename "$0") [-h] create-core|cleanup|index|dashboard
 
 where:
     -h  show this help text"
@@ -29,6 +29,9 @@ while [ "$1" != "" ]; do
     create-core )         shift
                           fin solr-commands/create-core
                           ;;
+    cleanup )             shift
+                          fin solr-commands/cleanup
+                          ;;
     index )               shift
                           fin drush search-api:index solr --batch-size=1
                           ;;

diff --git a/.docksal/commands/solr-commands/cleanup b/.docksal/commands/solr-commands/cleanup
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+## Cleanup the solr core data.
+
+# Environment variables passed from fin:
+#
+#   $PROJECT_ROOT - (string) absolute path to NEAREST .docksal folder
+#   $VIRTUAL_HOST - (string) ex. projectname.docksal
+#   $DOCROOT - name of the docroot folder
+#   $DOCKER_RUNNING - (string) "true" or "false"
+#   $SOLR_HOST -- (string) the hostname
+#   $SOLR_PORT -- (integer) the port
+#   $SOLR_CORE -- (string) the core name
+
+fin exec --in=solr "solr delete -c $SOLR_CORE -p $SOLR_PORT"