From a4ba2a7303f32767e67dc86b145d3e6b540d1e12 Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer <bpfeifer@influxdata.com> Date: Wed, 16 Apr 2025 16:03:03 -0400 Subject: [PATCH] fix(influxdb): only substitute environment variables when running 'influxdb3' --- influxdb/3.0-core/entrypoint.sh | 11 +++++++---- influxdb/3.0-enterprise/entrypoint.sh | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/influxdb/3.0-core/entrypoint.sh b/influxdb/3.0-core/entrypoint.sh index ab2af86..662d45f 100755 --- a/influxdb/3.0-core/entrypoint.sh +++ b/influxdb/3.0-core/entrypoint.sh @@ -1,9 +1,12 @@ #!/bin/bash set -euo pipefail -args=( "${@}" ) -for i in "${!args[@]}"; do - args[${i}]="$(echo "${args[${i}]}" | envsubst)" -done +args=("${@}") + +if [[ "${1}" == influxdb3 ]] ; then + for i in "${!args[@]}"; do + args[i]="$(envsubst <<<"${args[i]}")" + done +fi exec "${args[@]}" diff --git a/influxdb/3.0-enterprise/entrypoint.sh b/influxdb/3.0-enterprise/entrypoint.sh index ab2af86..662d45f 100755 --- a/influxdb/3.0-enterprise/entrypoint.sh +++ b/influxdb/3.0-enterprise/entrypoint.sh @@ -1,9 +1,12 @@ #!/bin/bash set -euo pipefail -args=( "${@}" ) -for i in "${!args[@]}"; do - args[${i}]="$(echo "${args[${i}]}" | envsubst)" -done +args=("${@}") + +if [[ "${1}" == influxdb3 ]] ; then + for i in "${!args[@]}"; do + args[i]="$(envsubst <<<"${args[i]}")" + done +fi exec "${args[@]}" -- GitLab