RESOLVED issue where the entrypoint could not support object-based en…

…vironment variables.
zulip · Sep 17, 2020 · 0404e09 · 0404e09
1 parent 9d866d7
commit 0404e09
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -95,6 +95,9 @@ setConfigurationValue() {
             [\[\(]*[\]\)])
             TYPE="array"
             ;;
+            ^{)
+            TYPE="object"
+            ;;
             *)
             TYPE="string"
             ;;
@@ -109,7 +112,7 @@ setConfigurationValue() {
         literal)
         VALUE="$1"
         ;;
-        bool|boolean|int|integer|array)
+        bool|boolean|int|integer|array|object)
         VALUE="$KEY = $2"
         ;;
         string|*)
@@ -262,6 +265,15 @@ zulipConfiguration() {
            [ "$setting_key" = "ALLOWED_HOSTS" ]; then
             type="array"
         fi
+        if [ "$setting_key" = "SOCIAL_AUTH_SAML_ORG_INFO" ] || \
+           [ "$setting_key" = "SOCIAL_AUTH_SAML_TECHNICAL_CONTACT" ] || \
+           [ "$setting_key" = "SOCIAL_AUTH_SAML_SUPPORT_CONTACT" ] || \
+           [ "$setting_key" = "SOCIAL_AUTH_SAML_SECURITY_CONFIG" ] || \
+           [ "$setting_key" = "SOCIAL_AUTH_SAML_SP_EXTRA" ] || \
+           [ "$setting_key" = "SOCIAL_AUTH_SAML_SECURITY_CONFIG" ] || \
+           [ "$setting_key" = "SOCIAL_AUTH_SAML_ENABLED_IDPS" ]; then
+            type="object"
+        fi
         if [ "$SPECIAL_SETTING_DETECTION_MODE" = "True" ] || [ "$SPECIAL_SETTING_DETECTION_MODE" = "true" ] || \
            [ "$type" = "string" ]; then
             type=""