From 60d55e2d55bc757758980a7981b5cf9c5fedf0e6 Mon Sep 17 00:00:00 2001 From: Francis Santiago Date: Tue, 19 May 2026 13:04:34 +0200 Subject: [PATCH] :whale: Fix frontend startup on hosts without IPv6 support Signed-off-by: Francis Santiago --- docker/images/files/nginx-entrypoint.sh | 9 ++++----- docker/images/files/nginx.conf.template | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docker/images/files/nginx-entrypoint.sh b/docker/images/files/nginx-entrypoint.sh index a98a3655e9..0948d38c61 100644 --- a/docker/images/files/nginx-entrypoint.sh +++ b/docker/images/files/nginx-entrypoint.sh @@ -46,13 +46,12 @@ export PENPOT_NITRATE_URI=${PENPOT_NITRATE_URI:-http://penpot-nitrate:3000} 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_MCP_URI_WS,\$PENPOT_HTTP_SERVER_MAX_BODY_SIZE" \ - < /tmp/nginx.conf.template > /etc/nginx/nginx.conf +export PENPOT_IPV6_LISTEN_DIRECTIVE=${PENPOT_IPV6_LISTEN_DIRECTIVE:-"listen [::]:8080 default_server;"} if [ "${PENPOT_DISABLE_IPV6_LISTEN}" = "true" ]; then - sed -i '/__PENPOT_IPV6_LISTEN_DIRECTIVE__/d' /etc/nginx/nginx.conf -else - sed -i 's|__PENPOT_IPV6_LISTEN_DIRECTIVE__| listen [::]:8080 default_server;|' /etc/nginx/nginx.conf + export PENPOT_IPV6_LISTEN_DIRECTIVE="" fi +envsubst "\$PENPOT_BACKEND_URI,\$PENPOT_EXPORTER_URI,\$PENPOT_NITRATE_URI,\$PENPOT_MCP_URI,\$PENPOT_MCP_URI_WS,\$PENPOT_HTTP_SERVER_MAX_BODY_SIZE,\$PENPOT_IPV6_LISTEN_DIRECTIVE" \ + < /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)" export PENPOT_INTERNAL_RESOLVER=${PENPOT_INTERNAL_RESOLVER:-$PENPOT_DEFAULT_INTERNAL_RESOLVER} diff --git a/docker/images/files/nginx.conf.template b/docker/images/files/nginx.conf.template index 9f70f31f61..6efcbc47f3 100644 --- a/docker/images/files/nginx.conf.template +++ b/docker/images/files/nginx.conf.template @@ -73,7 +73,7 @@ http { server { listen 8080 default_server; -__PENPOT_IPV6_LISTEN_DIRECTIVE__ + ${PENPOT_IPV6_LISTEN_DIRECTIVE} server_name _; client_max_body_size $PENPOT_HTTP_SERVER_MAX_BODY_SIZE;