Skip to content

Commit

Permalink
Packaging: Update marker used to allow ELASTIC_PASSWORD (#37243)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
rjernst committed Jan 18, 2019
1 parent 642e45e commit a2bdfb9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion distribution/docker/src/docker/bin/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down

0 comments on commit a2bdfb9

Please sign in to comment.