Apache Solr open-source search software
SOLR-15545: Properly source run-initdb in docker commands (#223)
Houston Putman3cb7e94f15d5
diff --git a/solr/docker/scripts/solr-create b/solr/docker/scripts/solr-createindex e0d9c0ee6ec..41f71500942 100755--- a/solr/docker/scripts/solr-create+++ b/solr/docker/scripts/solr-create@@ -29,7 +29,8 @@ if [[ "${VERBOSE:-}" == "yes" ]]; thenset -xfi-run-initdb+# Could set env-variables for solr-fg+source run-initdb# solr uses "-c corename". Parse the arguments to determine the core name.CORE_NAME="$(diff --git a/solr/docker/scripts/solr-demo b/solr/docker/scripts/solr-demoindex 1fe3917a1c1..8afdabe44f4 100755--- a/solr/docker/scripts/solr-demo+++ b/solr/docker/scripts/solr-demo@@ -22,7 +22,8 @@ if [[ "${VERBOSE:-}" == "yes" ]]; thenset -xfi-run-initdb+# Could set env-variables for solr-fg+source run-initdbCORE=demodiff --git a/solr/docker/scripts/solr-foreground b/solr/docker/scripts/solr-foregroundindex 768638bf57e..f7b5ba2e986 100755--- a/solr/docker/scripts/solr-foreground+++ b/solr/docker/scripts/solr-foreground@@ -21,6 +21,7 @@ if [[ "$VERBOSE" == "yes" ]]; thenset -xfi-run-initdb+# Could set env-variables for solr-fg+source run-initdbexec solr-fg "$@"diff --git a/solr/docker/scripts/solr-precreate b/solr/docker/scripts/solr-precreateindex 7b60496b005..96277e1d409 100755--- a/solr/docker/scripts/solr-precreate+++ b/solr/docker/scripts/solr-precreate@@ -31,7 +31,8 @@ if [[ "${VERBOSE:-}" == "yes" ]]; thenset -xfi-run-initdb+# Could set env-variables for solr-fg+source run-initdbprecreate-core "$@"diff --git a/solr/docker/tests/cases/initdb/test.sh b/solr/docker/tests/cases/initdb/test.shindex 5ff5808780c..9a642442b5d 100755--- a/solr/docker/tests/cases/initdb/test.sh+++ b/solr/docker/tests/cases/initdb/test.sh@@ -24,6 +24,7 @@ prepare_dir_to_mount 8983 "$initdb"cat > "$initdb/create-was-here.sh" <<EOMtouch /var/solr/initdb-was-here+export SOLR_HEAP="745m"EOMcat > "$initdb/ignore-me" <<EOMtouch /var/solr/should-not-be@@ -45,6 +46,11 @@ if [[ -n "$data" ]]; thenecho "Test $TEST_DIR $tag failed; should-not-be was"exit 1fi+data=$(docker exec --user=solr "$container_name" ps -ef)+if ! grep -q 'Xms745m' <<< "$data"; then+ echo "Test $TEST_DIR $tag failed; environment variable in initdb script not exported correctly"+ exit 1+fiecho "Checking docker logs"log="${BUILD_DIR}/docker.log-$container_name"if ! docker logs "$container_name" >"$log" 2>&1; then