honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Ryan Ernst 2019-01-18 11:49:40 -08:00 committed by GitHub
parent 642e45e9e6
commit a2bdfb9041
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distribution/docker/src/docker/bin/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ done < <(env)
# will run in. # will run in.
export ES_JAVA_OPTS="-Des.cgroups.hierarchy.override=/ $ES_JAVA_OPTS" 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 # Check for the ELASTIC_PASSWORD environment variable to set the
# bootstrap password for Security. # bootstrap password for Security.
# #