Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Limit _FILE env var support to specific vars #52525

Merged
merged 3 commits into from
Feb 21, 2020
Merged

Limit _FILE env var support to specific vars #52525

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f90c5b
Limit _FILE env var support to specific vars
pugnascotia Feb 19, 2020
7f850dd
Remove ES_JAVA_OPTS_FILE and rework existing tests
pugnascotia Feb 20, 2020
684ec82
Merge branch 'master' into 52503-limit-file-env-var-support
elasticmachine Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions distribution/src/bin/elasticsearch-env-from-file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ set -e -o pipefail
# point to it. This can be used to provide secrets to a container, without
# the values being specified explicitly when running the container.
#
# Note that only supported environment variables are processed, in order
# to avoid unexpected failures when an environment sets a "*_FILE" variable
# that doesn't contain a filename.
#
# This script is intended to be sourced, not executed, and modifies the
# environment.

for VAR_NAME_FILE in $(env | cut -f1 -d= | grep '_FILE$'); do
if [[ -n "$VAR_NAME_FILE" ]]; then
for VAR_NAME_FILE in ELASTIC_PASSWORD_FILE KEYSTORE_PASSWORD_FILE ES_JAVA_OPTS_FILE; do
if [[ -n "${!VAR_NAME_FILE}" ]]; then
VAR_NAME="${VAR_NAME_FILE%_FILE}"

if env | grep "^${VAR_NAME}="; then
Expand Down