Merge pull request #789 from influxdata/BNP_fix_influxdb3-core-enterprise

fix(influxdb): only substitute environment variables when running influxdb3

Author: bnpfeife

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[@]}"

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[@]}"