ENG-5543 Fixes another unbound variable issue when variable is not pr…

…ovided on environment
entando · Feb 26, 2025 · 20bf7f4 · 20bf7f4
1 parent 295f196
commit 20bf7f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -4,10 +4,10 @@ set -eu
 ENV_DOMAIN=${DOMAIN:-""}
 
 ENV_JSON='{'
-[ -n "$DOMAIN" ] && ENV_JSON+='"DOMAIN":"'"$ENV_DOMAIN"'", '
-[ -n "$DOMAIN_CM" ] && ENV_JSON+='"DOMAIN_CM":"'"$DOMAIN_CM"'", '
-[ -n "$KEYCLOAK_JSON" ] && ENV_JSON+='"KEYCLOAK_JSON":"'"$ENV_KEYCLOAK_JSON"'", '
-[ -n "$ENTANDO_VIRTUAL_CONTEXTS" ] && ENV_JSON+='"ENTANDO_VIRTUAL_CONTEXTS":"'"$ENTANDO_VIRTUAL_CONTEXTS"'"'
+[ -n "${DOMAIN:-""}" ] && ENV_JSON+='"DOMAIN":"'"$ENV_DOMAIN"'", '
+[ -n "${DOMAIN_CM:-""}" ] && ENV_JSON+='"DOMAIN_CM":"'"$DOMAIN_CM"'", '
+[ -n "${KEYCLOAK_JSON:-""}" ] && ENV_JSON+='"KEYCLOAK_JSON":"'"$KEYCLOAK_JSON"'", '
+[ -n "${ENTANDO_VIRTUAL_CONTEXTS:-""}" ] && ENV_JSON+='"ENTANDO_VIRTUAL_CONTEXTS":"'"$ENTANDO_VIRTUAL_CONTEXTS"'"'
 ENV_JSON+='}'
 
 ESCAPED_ENV_JSON=$(echo $ENV_JSON | sed 's/\"/\\\"/g' | sed 's/\//\\\//g' | tr -d '\n' | tr -d '[[:blank:]]')

diff --git a/test.html b/test.html