Merge 1a80932a08 into e1c83ba4ad

Dockerfile

@@ -23,8 +23,8 @@ ENV PUB_DISABLE_FAILURE_BLOCKS=${PUB_DISABLE_FAILURE_BLOCKS}
 COPY package.json ./
 
 RUN apt-get update && \
-	apt-get install -y --no-install-recommends git && \
-	rm -rf /var/lib/apt/lists/*
+    apt-get install -y --no-install-recommends git && \
+    rm -rf /var/lib/apt/lists/*
 
 RUN bun install
 
@@ -34,11 +34,18 @@ RUN bun run build
 
 FROM nginx:stable-alpine
 
+RUN apk add --no-cache iproute2
+
 EXPOSE 80/tcp
 
-COPY ./nginx/default.conf /etc/nginx/conf.d/default.conf
+COPY ./nginx/default.conf.template /etc/nginx/conf.d/default.conf
+COPY ./docker-entrypoint.sh /docker-entrypoint-custom.sh
+RUN chmod +x /docker-entrypoint-custom.sh
 
 COPY --from=builder /app/build /usr/share/nginx/html
 
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-	CMD curl --fail --silent --output /dev/null http://localhost || exit 1
+    CMD curl --fail --silent --output /dev/null http://localhost || exit 1
+
+ENTRYPOINT ["/docker-entrypoint-custom.sh"]
+CMD ["nginx", "-g", "daemon off;"]

docker-entrypoint.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -f /proc/net/if_inet6 ] && ip -6 addr show lo >/dev/null 2>&1; then
+    sed -i 's/# IPV6_PLACEHOLDER/listen [::]:80;/' /etc/nginx/conf.d/default.conf
+else
+    sed -i 's/# IPV6_PLACEHOLDER//' /etc/nginx/conf.d/default.conf
+fi
+
+exec /docker-entrypoint.sh "$@"

nginx/default.conf.template

@@ -1,6 +1,6 @@
 server {
     listen 80;
-    listen [::]:80;
+    # IPV6_PLACEHOLDER
     server_name vert;
 
     root /usr/share/nginx/html;
@@ -8,7 +8,6 @@ server {
 
     client_max_body_size 10M;
 
-    # Security headers
     add_header X-Frame-Options "SAMEORIGIN" always;
     add_header X-Content-Type-Options "nosniff" always;
     add_header Referrer-Policy "strict-origin-when-cross-origin" always;
@@ -19,4 +18,4 @@ server {
     }
     
     error_page 404 /index.html;
-}
+}