Web: fix running with port 80 on k8s (again)

Author: djbe

web-base/Dockerfile

@@ -21,6 +21,8 @@ FROM common:${ALPINE_VERSION}-nginx AS base
 # Copy configuration files
 # - nginx
 COPY config/nginx/http.d/ /etc/nginx/http.d/
+# - s6-overlay
+COPY config/s6-overlay /etc/s6-overlay/s6-rc.d/
 # - init
 COPY scripts/ /scripts/
 COPY --from=build /app/import-meta-env /usr/bin/import-meta-env

web-base/config/nginx/http.d/default.conf

@@ -4,8 +4,8 @@ server {
   server_name _;
 
   # Legacy, remove this when everything is migrated to 8080
-  listen 80;
-  listen [::]:80;
+  listen 80 default_server;
+  listen [::]:80 default_server;
 
   root /app/www;
   index index.html;

web-base/config/s6-overlay/nginx/run

@@ -0,0 +1,5 @@
+#!/usr/bin/execlineb -P
+
+# Note: this overrides the normal nginx runner, because we listen on port 80
+# Get rid of this after that legacy is cleaned up
+nginx