Packaging: Update marker used to allow ELASTIC_PASSWORD (#37243)

rjernst · web-flow · commit a2bdfb904152 · 2019-01-18T11:49:40.000-08:00
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
diff --git 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.
   #

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ done < <(env)`
`75`	`75`	`# will run in.`
`76`	`76`	`export ES_JAVA_OPTS="-Des.cgroups.hierarchy.override=/ $ES_JAVA_OPTS"`
`77`	`77`
`78`		`-if [[ -d bin/x-pack ]]; then`
	`78`	`+if [[ -f bin/elasticsearch-users ]]; then`
`79`	`79`	`# Check for the ELASTIC_PASSWORD environment variable to set the`
`80`	`80`	`# bootstrap password for Security.`
`81`	`81`	`#`