Merge pull request #361 from jhu-idc/tm--fixConfigStartup-brokenFedor…

…aDep

re-include startup config import, chullo & fedora, solr startup error, etc.

.env

@@ -1,10 +1,9 @@
-
 # Environment variables defined in this file apply to both the Makefile and to
 # docker-compose.yml
 #
 # Due to restrictions in the `env-file` format we cannot specify multi-line
 # values for environment variables. For this reason the environment
-# variables are set on service definitions in the docker-compose.activemq.yml docker-compose.alpaca.yml docker-compose.blazegraph.yml docker-compose.cantaloupe.yml docker-compose.crayfish.mariadb.yml docker-compose.crayfish.postgresql.yml docker-compose.crayfish.yml docker-compose.crayfits.yml docker-compose.custom.yml docker-compose.demo.yml docker-compose.drupal-dev.yml docker-compose.drupal.mariadb.yml docker-compose.drupal.postgresql.yml docker-compose.drupal.yml docker-compose.env.yml docker-compose.etcd.yml docker-compose.fcrepo.mariadb.yml docker-compose.fcrepo.postgresql.yml docker-compose.fcrepo.yml docker-compose.idc-crayfish.yml docker-compose.idc-snapshot.yml docker-compose.local.yml docker-compose.mariadb.yml docker-compose.matomo.yml docker-compose.minio.yml docker-compose.postgresql.yml docker-compose.saml.yml docker-compose.sample.env.yml docker-compose.solr.yml docker-compose.static.yml docker-compose.testcafe.yml docker-compose.traefik.yml docker-compose.watchtower.yml files,
+# variables are set on service definitions in the docker-compose.*.yml files,
 # rather than defined in `env-file` files.
 
 # Determines which docker-compose file(s) will be used for the `drupal` service.
@@ -13,7 +12,7 @@
 #
 # If this value is changed, docker-compose.yml must be updated in order for it
 # to take effect; e.g. 'make dev-up'
-ENVIRONMENT=static
+ENVIRONMENT=local
 
 REQUIRED_SERIVCES=activemq alpaca cantaloupe idc-crayfish drupal mariadb solr idc-snapshot testcafe minio
 ###############################################################################
@@ -105,12 +104,12 @@ DRUPAL_DEFAULT_S3_USE_CUSTOMHOST=true
 DRUPAL_DEFAULT_S3_USE_PATH_STYLE_ENDPOINT=true
 DRUPAL_DEFAULT_S3_PRIVATE_PATH=pr
 
-# Drupal's Trusted Host List - This should be a comma separated list of strings, if you require more than one.
+# Drupal's Trusted Host List -  This should be a comma separated list of strings, if you require more than one.
 # (If you put DRUPAL prefix on it, things will start to fail as the drupal container will put any DRUPAL_* env vars
 # into the fastcgi params file and the container will no longer start with this one there (the $ is probably the issue).
 # https://github.com/jhu-idc/idc-isle-buildkit/blob/main/drupal/rootfs/etc/cont-init.d/97-setup-drupal-environment-variables.sh)
-#TRUSTED_HOST_LIST=^.+.traefik.me$
-TRUSTED_HOST_LIST=^.+.traefik.me$$,^.+.library.jhu.edu$$
+#TRUSTED_HOST_LIST=^.+\.traefik\.me$
+TRUSTED_HOST_LIST=^.+\.traefik\.me$$,^.+\.library\.jhu\.edu$$
 
 # Google Tag Manager
 DRUPAL_GTM_CONTAINER_ID=
@@ -158,4 +157,5 @@ TEST_OPERATION_TIMEOUT_MS=180000
 MIGRATION_ASSETS_IMAGE_TAG=9519543.1637091427
 ALPACA_HOMERUS_HTTP_SOCKET_TIMEOUT_MS=7200000
 DRUPAL_JWT_EXPIRY_INTERVAL='+4 hour'
-DRUPAL_STATIC_TAG=static
+ACTIVEMQ_WEB_PORT=8161
+

codebase/composer.json

@@ -19,6 +19,10 @@
             "type": "vcs",
             "url": "[email protected]:Islandora/islandora.git"
         },
+        {
+            "type": "vcs",
+            "url": "[email protected]:Islandora/chullo.git"
+        },
         {
             "type": "vcs",
             "url": "[email protected]:jhu-idc/islandora_defaults.git"
@@ -96,18 +100,6 @@
                 }
             }
         },
-        {
-            "type": "package",
-            "package": {
-                "name": "islandora/chullo",
-                "version": "dev-dev",
-                "source": {
-                    "type": "git",
-                    "url": "https://github.com/Islandora/chullo.git",
-                    "reference": "d563d5e48ef9b15dcf45029277bbc2f6eeef2454"
-                }
-            }
-        },
         {
             "type": "package",
             "package": {
@@ -168,6 +160,7 @@
         "imagesloaded/imagesloaded": "^4.1",
         "islandora-rdm/islandora_fits": "dev-8.x-1.x",
         "islandora/carapace": "dev-8.x-3.x",
+        "islandora/chullo": "1.2.0 as dev-dev",
         "jhu-idc/idc-ui-theme": "dev-main",
         "jhu-idc/idc_defaults": "dev-main",
         "jhu-idc/idc_export": "dev-main",
@@ -267,14 +260,13 @@
             "simplesamlphp/simplesamlphp": {
                 "SimpleSAMLphp config": "patches/simplesaml_config.patch"
             },
-            "drupal/title_length": {
-                "Node title length 1: Apply user config override": "patches/node_title_length_fix-hook-install.patch",
-                "Node title length 2: Taxonomy name length": "patches/node_title_length_termNameCharLength-3041979-8.patch"
-            },
             "islandora/islandora": {
                 "Routing definitions": "patches/islandora.routing.yml.patch",
                 "Media Source Serivce": "patches/mediasourceservice.patch",
                 "Media Source Controller": "patches/mediasourcecontroller.patch"
+            },
+            "drupal/search_api_solr": {
+                "search_api_solr_defaults_post_update_uninstall_module": "patches/search_api_solr_defaults_post_update_uninstall_module.patch"
             }
         }
     }