diff --git a/docker-compose.solr.yaml b/docker-compose.solr.yaml index 43f2b8c..a1f926a 100644 --- a/docker-compose.solr.yaml +++ b/docker-compose.solr.yaml @@ -61,13 +61,6 @@ services: - ".:/mnt/ddev_config" - # solr-configupdate.sh copies fresh configuration files into the - # solr container on each - # startup, so if you change the config in .ddev/solr/conf - # it will be refreshed on `ddev start`. It must be executable, - # `chmod +x solr - - "./solr/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d" - # The odd need to use $$SOLR_CORENAME here is explained in # https://stackoverflow.com/a/48189916/215713 entrypoint: 'bash -c "VERBOSE=yes docker-entrypoint.sh solr-precreate $${SOLR_CORENAME:-dev} /solr-conf"' diff --git a/install.yaml b/install.yaml index d543aee..f9901ca 100644 --- a/install.yaml +++ b/install.yaml @@ -5,10 +5,6 @@ pre_install_actions: # files and directories listed here are copied into .ddev project_files: - solr/conf -- solr/docker-entrypoint-initdb.d/solr-configupdate.sh - docker-compose.solr.yaml post_install_actions: - - | - #ddev-description:Make sure solr-configupdate.sh is executable - chmod +x solr/docker-entrypoint-initdb.d/solr-configupdate.sh diff --git a/solr/docker-entrypoint-initdb.d/solr-configupdate.sh b/solr/docker-entrypoint-initdb.d/solr-configupdate.sh deleted file mode 100644 index 1d4c374..0000000 --- a/solr/docker-entrypoint-initdb.d/solr-configupdate.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -#ddev-generated -set -e - -# Ensure "dev" (or alternate SOLR_CORENAME) core config is always up to date even after the -# core has been created. This does not execute the first time, -# when solr-precreate has not yet run. -CORENAME=${SOLR_CORENAME:-dev} -if [ -d /var/solr/data/${CORENAME}/conf ]; then - cp /solr-conf/conf/* /var/solr/data/${CORENAME}/conf -fi