From 4289cad9ab3c47a2240b6d946076798bd40ddbd0 Mon Sep 17 00:00:00 2001
From: Yamila Moreno <yamila.moreno@kaleidos.net>
Date: Tue, 12 May 2026 23:28:20 +0200
Subject: [PATCH] :whale: Improve nginx configuration for MCP server (#9565)

---
 docker/images/files/nginx-entrypoint.sh | 5 +++--
 docker/images/files/nginx.conf.template | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docker/images/files/nginx-entrypoint.sh b/docker/images/files/nginx-entrypoint.sh
index 9ce2b9261d..e791ac64f0 100644
--- a/docker/images/files/nginx-entrypoint.sh
+++ b/docker/images/files/nginx-entrypoint.sh
@@ -34,9 +34,10 @@ update_flags /var/www/app/js/config.js
 export PENPOT_BACKEND_URI=${PENPOT_BACKEND_URI:-http://penpot-backend:6060}
 export PENPOT_EXPORTER_URI=${PENPOT_EXPORTER_URI:-http://penpot-exporter:6061}
 export PENPOT_NITRATE_URI=${PENPOT_NITRATE_URI:-http://penpot-nitrate:3000}
-export PENPOT_MCP_URI=${PENPOT_MCP_URI:-http://penpot-mcp}
+export PENPOT_MCP_URI=${PENPOT_MCP_URI:-http://penpot-mcp:4401}
+export PENPOT_MCP_URI_WS=${PENPOT_MCP_URI_WS:-http://penpot-mcp:4402}
 export PENPOT_HTTP_SERVER_MAX_BODY_SIZE=${PENPOT_HTTP_SERVER_MAX_BODY_SIZE:-367001600} # Default to 350MiB
-envsubst "\$PENPOT_BACKEND_URI,\$PENPOT_EXPORTER_URI,\$PENPOT_NITRATE_URI,\$PENPOT_MCP_URI,\$PENPOT_HTTP_SERVER_MAX_BODY_SIZE" \
+envsubst "\$PENPOT_BACKEND_URI,\$PENPOT_EXPORTER_URI,\$PENPOT_NITRATE_URI,\$PENPOT_MCP_URI,\$PENPOT_MCP_URI_WS,\$PENPOT_HTTP_SERVER_MAX_BODY_SIZE" \
          < /tmp/nginx.conf.template > /etc/nginx/nginx.conf
 
 PENPOT_DEFAULT_INTERNAL_RESOLVER="$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf)"
diff --git a/docker/images/files/nginx.conf.template b/docker/images/files/nginx.conf.template
index f365cbd512..c182856e6b 100644
--- a/docker/images/files/nginx.conf.template
+++ b/docker/images/files/nginx.conf.template
@@ -142,17 +142,17 @@ http {
         location /mcp/ws {
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection 'upgrade';
-            proxy_pass $PENPOT_MCP_URI:4402;
+            proxy_pass $PENPOT_MCP_URI_WS;
             proxy_http_version 1.1;
         }
 
         location /mcp/stream {
-            proxy_pass $PENPOT_MCP_URI:4401/mcp;
+            proxy_pass $PENPOT_MCP_URI/mcp;
             proxy_http_version 1.1;
         }
 
         location /mcp/sse {
-            proxy_pass $PENPOT_MCP_URI:4401/sse;
+            proxy_pass $PENPOT_MCP_URI/sse;
             proxy_http_version 1.1;
         }