Skip to content

Commit

Permalink
Update args to handle cloud being default start mode
Browse files Browse the repository at this point in the history
  • Loading branch information
epugh committed Oct 10, 2024
1 parent 804317a commit d1614a7
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions dev-docs/running-in-docker.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ To run Solr in a container and expose the Solr port, run:
In order to start Solr in cloud mode, run the following.
`docker run -p 8983:8983 solr solr-fg -c`
`docker run -p 8983:8983 solr solr-fg`
For documentation on using the official docker builds, please refer to the https://hub.docker.com/_/solr[DockerHub page].
Up-to-date documentation for running locally built images of this branch can be found in the xref:_running_solr_in_docker[local reference guide].
Expand All @@ -30,4 +30,4 @@ For more info on building an image, run:
`./gradlew helpDocker`

== Additional Information
You can find additional information in the https://solr.apache.org/guide/solr/latest/deployment-guide/solr-in-docker.html[Solr Ref Guide Docker Page]
You can find additional information in the https://solr.apache.org/guide/solr/latest/deployment-guide/solr-in-docker.html[Solr Ref Guide Docker Page]
2 changes: 1 addition & 1 deletion solr/docker/scripts/solr-create
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ else
fi
fi

exec solr-fg
exec solr-fg --user-managed
2 changes: 1 addition & 1 deletion solr/docker/scripts/solr-demo
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ else
fi
fi

exec solr-fg
exec solr-fg --user-managed
4 changes: 2 additions & 2 deletions solr/docker/scripts/solr-fg
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ if [[ -z "${TINI:-}" ]]; then
fi
fi
if [[ "$TINI" == yes ]]; then
exec tini -- solr start --user-managed -f "$@"
exec tini -- solr start -f "$@"
elif [[ "$TINI" == no ]]; then
exec solr start --user-managed -f "$@"
exec solr start -f "$@"
else
echo "invalid value TINI=$TINI"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion solr/docker/scripts/solr-precreate
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ source run-initdb

precreate-core "$@"

exec solr-fg
exec solr-fg --user-managed
4 changes: 2 additions & 2 deletions solr/docker/tests/cases/cloud_multi_node_embedded_zk/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ TEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"
source "${TEST_DIR}/../../shared.sh"

echo "Running base solr node w/embeddedZk - $container_name"
docker run --name "${container_name}" -d "$tag" solr-fg -c
docker run --name "${container_name}" -d "$tag" solr-fg

wait_for_container_and_solr "${container_name}"

Expand All @@ -32,7 +32,7 @@ container_cleanup "${container_name}-2"
echo "Running additional solr node - $container_name-2"
docker run --name "$container_name-2" -d \
--env "ZK_HOST=${solr_ip}:9983" \
"$tag" solr-fg -c
"$tag" solr-fg

wait_for_container_and_solr "${container_name}-2"

Expand Down
2 changes: 1 addition & 1 deletion solr/docker/tests/cases/user_volume/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ docker run \
-v "$mylogs:/var/solr/logs" \
--user "$(id -u):$(id -g)" \
--name "$container_name" \
-d "$tag"
-d "$tag" --user-managed

wait_for_container_and_solr "$container_name"

Expand Down

0 comments on commit d1614a7

Please sign in to comment.