From a2bdfb9041528e52ccc21369886f811802d12ce6 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Fri, 18 Jan 2019 11:49:40 -0800 Subject: [PATCH] Packaging: Update marker used to allow ELASTIC_PASSWORD (#37243) This commit updates the file docker's entrypoint script looks for when deciding to process the ELASTIC_PASSWORD env var. The x-pack subdir of bin no longer exists in 7.0, where the backcompat layer for x-pack script locations was removed. closes #37240 --- distribution/docker/src/docker/bin/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/docker/src/docker/bin/docker-entrypoint.sh b/distribution/docker/src/docker/bin/docker-entrypoint.sh index 3158aaedae1..b9aab95bc2e 100644 --- a/distribution/docker/src/docker/bin/docker-entrypoint.sh +++ b/distribution/docker/src/docker/bin/docker-entrypoint.sh @@ -75,7 +75,7 @@ done < <(env) # will run in. export ES_JAVA_OPTS="-Des.cgroups.hierarchy.override=/ $ES_JAVA_OPTS" -if [[ -d bin/x-pack ]]; then +if [[ -f bin/elasticsearch-users ]]; then # Check for the ELASTIC_PASSWORD environment variable to set the # bootstrap password for Security. #