Fix public edge interface assignments

compose.public-app.yaml

@@ -2,12 +2,14 @@ services:
   app:
     networks:
       public_edge:
+        interface_name: eth2
         aliases:
           - ${PUBLIC_UPSTREAM_NAME:?Set PUBLIC_UPSTREAM_NAME when PUBLIC_EDGE_ENABLED=true}
 
   web:
     networks:
       public_edge:
+        interface_name: eth3
         aliases:
           - ${PUBLIC_UPSTREAM_NAME:?Set PUBLIC_UPSTREAM_NAME when PUBLIC_EDGE_ENABLED=true}
 

scripts/quality.sh

@@ -334,6 +334,13 @@ docker compose --project-directory "$ROOT" --env-file "$edge_env" \
 ./scripts/compose.sh "$external_production_env" config --quiet
 ./scripts/compose.sh "$external_socket_production_env" config --quiet
 ./scripts/compose.sh "$external_split_production_env" config --quiet
+./scripts/compose.sh "$staging_env" config --format json |
+  jq --exit-status '
+    .services.app.networks.internal.interface_name == "eth0" and
+    .services.app.networks.egress.interface_name == "eth1" and
+    .services.app.networks.public_edge.interface_name == "eth2" and
+    .services.app.networks.public_edge.aliases == ["who-need-help-staging"]
+  ' >/dev/null
 ./scripts/compose.sh .env.example config --format json |
   jq --exit-status '
     . as $root
@@ -385,6 +392,9 @@ docker compose --project-directory "$ROOT" --env-file "$edge_env" \
     .services.app.environment.APP_ROLE == "combined" and
     .services.app.environment.DNS_CLUSTER_QUERY == "ignore" and
     .services.app.environment.POOL_SIZE == "4" and
+    .services.app.networks.internal.interface_name == "eth0" and
+    .services.app.networks.egress.interface_name == "eth1" and
+    .services.app.networks.public_edge.interface_name == "eth2" and
     .services.app.networks.public_edge.aliases == ["who-need-help-production"] and
     .networks.public_edge.external == true and
     .services.app.ports[0].host_ip == "127.0.0.1"
@@ -396,6 +406,7 @@ docker compose --project-directory "$ROOT" --env-file "$edge_env" \
     (.services | has("web") | not) and
     (.services | has("worker") | not) and
     (.services | has("proxy") | not) and
+    .services.app.networks.public_edge.interface_name == "eth2" and
     .services.app.networks.public_edge.aliases == ["who-need-help-production"]
   ' >/dev/null
 ./scripts/compose.sh "$external_socket_production_env" config --format json |
@@ -428,6 +439,10 @@ docker compose --project-directory "$ROOT" --env-file "$edge_env" \
     (.services | has("web")) and
     (.services | has("worker")) and
     (.services | has("proxy")) and
+    .services.web.networks.internal.interface_name == "eth0" and
+    .services.web.networks.ingress.interface_name == "eth1" and
+    .services.web.networks.egress.interface_name == "eth2" and
+    .services.web.networks.public_edge.interface_name == "eth3" and
     .services.web.networks.public_edge.aliases == ["who-need-help-production"] and
     .services.web.deploy.replicas == 2 and
     .services.worker.deploy.replicas == 2