From 6dc5e4806b2602893c01af6ff4c728a3cd57ddfc Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Fri, 31 Oct 2025 19:00:47 +0100
Subject: [PATCH] Fix multi private domain encoding issue with all-in-one
 docker container (#1287)

---
 dockerfiles/all-in-one/s6-scripts/client/run | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dockerfiles/all-in-one/s6-scripts/client/run b/dockerfiles/all-in-one/s6-scripts/client/run
index bfd993283..6fc139060 100644
--- a/dockerfiles/all-in-one/s6-scripts/client/run
+++ b/dockerfiles/all-in-one/s6-scripts/client/run
@@ -50,10 +50,18 @@ if [ ! -f /etc/nginx/ssl/nginx.crt ] || [ ! -f /etc/nginx/ssl/nginx.key ]; then
     chmod 600 /etc/nginx/ssl/nginx.key
 fi
 
-# Create simple JSON with environment variables
+# Convert comma-separated PRIVATE_EMAIL_DOMAINS to JSON array
+if [ -z "$PRIVATE_EMAIL_DOMAINS" ]; then
+    json_array="[]"
+else
+    # Convert comma-separated list to JSON array
+    json_array=$(echo "$PRIVATE_EMAIL_DOMAINS" | awk '{split($0,a,","); printf "["; for(i=1;i<=length(a);i++) {printf "\"%s\"", a[i]; if(i<length(a)) printf ","} printf "]"}')
+fi
+
+# Create JSON with environment variables
 cat > /app/client/wwwroot/appsettings.json << EOF
 {
-    "PrivateEmailDomains": ["$PRIVATE_EMAIL_DOMAINS"],
+    "PrivateEmailDomains": $json_array,
     "SupportEmail": "$SUPPORT_EMAIL",
     "PublicRegistrationEnabled": "$PUBLIC_REGISTRATION_ENABLED"
 }