ci(general): updates gateway/voices deployments (#2176)

Author: jmgilman

catalyst-gateway/blueprint.cue

@@ -11,6 +11,7 @@ project: {
 			merge: {}
 			tag: {}
 		}
+
 		bundle: {
 			modules: main: {
 				name:    "app"
@@ -185,13 +186,10 @@ project: {
 						}
 					}
 
-					ingress: {
-						health: {
-							path:         "/api/v1/health/live"
-							successCodes: "204"
-						}
-						subdomain: "gateway"
-					}
+					dns: subdomain: "gateway"
+					route: rules: [{
+						matchPrefix: "/"
+					}]
 
 					secrets: {
 						db: {
@@ -222,6 +220,7 @@ project: {
 			}
 		}
 	}
+
 	release: {
 		docker: {
 			on: {

catalyst_voices/Earthfile

@@ -129,7 +129,11 @@ package:
     ARG tag='latest'
 
     COPY +build-web/web /app
+
+    # Note this is only used for local development, a different nginx.conf is
+    # used during deployment. See blueprint.cue.
     COPY ./nginx.conf /etc/nginx/nginx.conf
+
     EXPOSE 80
 
     SAVE IMAGE voices-frontend:$tag

catalyst_voices/blueprint.cue

@@ -6,6 +6,7 @@ project: {
 			merge: {}
 			tag: {}
 		}
+
 		bundle: {
 			modules: main: {
 				name:    "app"
@@ -16,21 +17,83 @@ project: {
 							name: _ @forge(name="CONTAINER_IMAGE")
 							tag:  _ @forge(name="GIT_HASH_OR_TAG")
 						}
-						port: 80
+						mounts: {
+							config: {
+								ref: {
+									config: {
+										name: "nginx"
+									}
+								}
+								path:    "/etc/nginx/nginx.conf"
+								subPath: "nginx.conf"
+							}
+						}
+						port: 8080
 						probes: {
 							liveness: path:  "/"
 							readiness: path: "/"
 						}
 					}
-					ingress: subdomain: "voices"
+
+					configs: nginx: data: "nginx.conf": """
+						user  nginx;
+						worker_processes  1;
+						error_log  /var/log/nginx/error.log warn;
+						pid        /var/run/nginx.pid;
+						events {
+						  worker_connections  1024;
+						}
+						http {
+						  include       /etc/nginx/mime.types;
+						  default_type  application/octet-stream;
+						  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+											'$status $body_bytes_sent "$http_referer" '
+											'"$http_user_agent" "$http_x_forwarded_for"';
+						  access_log  /var/log/nginx/access.log  main;
+						  sendfile        on;
+						  keepalive_timeout  65;
+						  server {
+							listen       8080;
+							server_name  localhost;
+
+							# https://cjycode.com/flutter_rust_bridge/manual/miscellaneous/web-cross-origin#background
+							# https://drift.simonbinder.eu/platforms/web/#additional-headers
+							add_header Cross-Origin-Opener-Policy "same-origin";
+							add_header Cross-Origin-Embedder-Policy "require-corp";
+
+							location / {
+							  root   /app;
+							  index  index.html;
+							  try_files $uri $uri/ /index.html;
+							}
+
+							# Ensure that /m4 (and any other SPA path) serves index.html
+							location /m4 {
+							  root /app;
+							  try_files $uri $uri/ /index.html;
+							}
+							error_page   500 502 503 504  /50x.html;
+							location = /50x.html {
+							  root   /usr/share/nginx/html;
+							}
+						  }
+						}
+						"""
+
+					dns: subdomain: "voices"
+					route: rules: [{
+						matchPrefix: "/"
+					}]
+
 					service: {
-						targetPort: 80
 						port:       80
+						targetPort: 8080
 					}
 				}
 			}
 		}
 	}
+
 	release: {
 		docker: {
 			on: {