Joseph Doherty
0d2d6de6c6
The central containers have always set it; the six site containers never did, so the Development-only DI scope validation from register row 50 (ServiceProviderValidation.Configure — ValidateScopes/ValidateOnBuild) was dead on exactly the half of the topology that has six of the eight nodes. Program.cs even carried a comment saying the site branch 'is the one that actually gains coverage' while the rig gave it none; that comment is corrected here too. Now that the site graph validates clean this buys live coverage: a captive dependency or an unconstructible site-only descriptor fails the container at boot instead of surfacing later as a mid-run resolve error. Applied to all six docker/ site containers and both docker-env2/ site containers, keeping the two rigs consistent. Dev/rig only — never production. FILE EDITS ONLY: no docker command was run, and deploy.sh was not invoked. Both compose files re-parsed with yaml.safe_load; all 8 + 4 services confirmed to carry the expected env.
128 lines
5.7 KiB
YAML
128 lines
5.7 KiB
YAML
services:
|
|
central-a:
|
|
image: scadabridge:latest
|
|
# CoordinatedShutdown needs cluster-leave (15s budget) + cluster-exiting +
|
|
# actor-system-terminate + Serilog flush; the 10s SIGTERM default SIGKILLed
|
|
# mid-drain, turning every redeploy into the crash path (review 01 [Medium]).
|
|
stop_grace_period: 30s
|
|
container_name: scadabridge-env2-central-a
|
|
environment:
|
|
SCADABRIDGE_CONFIG: Central
|
|
ASPNETCORE_ENVIRONMENT: Development
|
|
ASPNETCORE_URLS: "http://+:5000"
|
|
# DEV-ONLY local-cluster value — NOT a real secret. The Auth/Config normalization
|
|
# (2026-06-03) made ScadaBridge:InboundApi:ApiKeyPepper a hard Central startup
|
|
# requirement (>=16 chars, per-environment). Distinct from the docker/ cluster's
|
|
# pepper per the "different per environment" guidance; real deployments inject a
|
|
# true secret out-of-band, never from source control. Both Central nodes share it.
|
|
ScadaBridge__InboundApi__ApiKeyPepper: "dev-only-insecure-pepper-env2-cluster-0001"
|
|
# DEV-ONLY gRPC control-plane preshared key for site-x — NOT a real secret.
|
|
# Must match ScadaBridge:Communication:GrpcPsk in site-x-node-*/appsettings.Site.json.
|
|
# Production seeds SB-GRPC-PSK-<siteId> into the secret store instead.
|
|
ScadaBridge__Communication__SitePsks__site-x: "dev-grpc-psk-docker-env2-site-x"
|
|
ports:
|
|
- "9101:5000" # Web UI + Inbound API
|
|
- "9111:8081" # Akka remoting
|
|
volumes:
|
|
- ./central-node-a/appsettings.Central.json:/app/appsettings.Central.json:ro
|
|
- ./central-node-a/logs:/app/logs
|
|
networks:
|
|
- scadabridge-net
|
|
restart: unless-stopped
|
|
|
|
central-b:
|
|
image: scadabridge:latest
|
|
# CoordinatedShutdown needs cluster-leave (15s budget) + cluster-exiting +
|
|
# actor-system-terminate + Serilog flush; the 10s SIGTERM default SIGKILLed
|
|
# mid-drain, turning every redeploy into the crash path (review 01 [Medium]).
|
|
stop_grace_period: 30s
|
|
container_name: scadabridge-env2-central-b
|
|
environment:
|
|
SCADABRIDGE_CONFIG: Central
|
|
ASPNETCORE_ENVIRONMENT: Development
|
|
ASPNETCORE_URLS: "http://+:5000"
|
|
# DEV-ONLY local-cluster value — NOT a real secret. The Auth/Config normalization
|
|
# (2026-06-03) made ScadaBridge:InboundApi:ApiKeyPepper a hard Central startup
|
|
# requirement (>=16 chars, per-environment). Distinct from the docker/ cluster's
|
|
# pepper per the "different per environment" guidance; real deployments inject a
|
|
# true secret out-of-band, never from source control. Both Central nodes share it.
|
|
ScadaBridge__InboundApi__ApiKeyPepper: "dev-only-insecure-pepper-env2-cluster-0001"
|
|
# DEV-ONLY gRPC control-plane preshared key for site-x — NOT a real secret.
|
|
# Must match ScadaBridge:Communication:GrpcPsk in site-x-node-*/appsettings.Site.json.
|
|
# Production seeds SB-GRPC-PSK-<siteId> into the secret store instead.
|
|
ScadaBridge__Communication__SitePsks__site-x: "dev-grpc-psk-docker-env2-site-x"
|
|
ports:
|
|
- "9102:5000" # Web UI + Inbound API
|
|
- "9112:8081" # Akka remoting
|
|
volumes:
|
|
- ./central-node-b/appsettings.Central.json:/app/appsettings.Central.json:ro
|
|
- ./central-node-b/logs:/app/logs
|
|
networks:
|
|
- scadabridge-net
|
|
restart: unless-stopped
|
|
|
|
site-x-a:
|
|
image: scadabridge:latest
|
|
# CoordinatedShutdown needs cluster-leave (15s budget) + cluster-exiting +
|
|
# actor-system-terminate + Serilog flush; the 10s SIGTERM default SIGKILLed
|
|
# mid-drain, turning every redeploy into the crash path (review 01 [Medium]).
|
|
stop_grace_period: 30s
|
|
container_name: scadabridge-env2-site-x-a
|
|
environment:
|
|
SCADABRIDGE_CONFIG: Site
|
|
# Register row 63 — mirrors docker/docker-compose.yml. Enables the Development-only
|
|
# DI scope validation (register row 50) on the site nodes, which previously ran
|
|
# unvalidated because only the central containers set this. Dev/rig only.
|
|
ASPNETCORE_ENVIRONMENT: Development
|
|
ports:
|
|
- "9121:8082" # Akka remoting
|
|
- "9123:8083" # gRPC streaming
|
|
volumes:
|
|
- ./site-x-node-a/appsettings.Site.json:/app/appsettings.Site.json:ro
|
|
- ./site-x-node-a/data:/app/data
|
|
- ./site-x-node-a/logs:/app/logs
|
|
networks:
|
|
- scadabridge-net
|
|
restart: unless-stopped
|
|
|
|
site-x-b:
|
|
image: scadabridge:latest
|
|
# CoordinatedShutdown needs cluster-leave (15s budget) + cluster-exiting +
|
|
# actor-system-terminate + Serilog flush; the 10s SIGTERM default SIGKILLed
|
|
# mid-drain, turning every redeploy into the crash path (review 01 [Medium]).
|
|
stop_grace_period: 30s
|
|
container_name: scadabridge-env2-site-x-b
|
|
environment:
|
|
SCADABRIDGE_CONFIG: Site
|
|
# Register row 63 — mirrors docker/docker-compose.yml. Enables the Development-only
|
|
# DI scope validation (register row 50) on the site nodes, which previously ran
|
|
# unvalidated because only the central containers set this. Dev/rig only.
|
|
ASPNETCORE_ENVIRONMENT: Development
|
|
ports:
|
|
- "9122:8082" # Akka remoting
|
|
- "9124:8083" # gRPC streaming
|
|
volumes:
|
|
- ./site-x-node-b/appsettings.Site.json:/app/appsettings.Site.json:ro
|
|
- ./site-x-node-b/data:/app/data
|
|
- ./site-x-node-b/logs:/app/logs
|
|
networks:
|
|
- scadabridge-net
|
|
restart: unless-stopped
|
|
|
|
traefik:
|
|
image: traefik:v3.4
|
|
container_name: scadabridge-env2-traefik
|
|
ports:
|
|
- "9100:80" # Env2 central load-balanced entrypoint
|
|
- "8181:8080" # Env2 Traefik dashboard
|
|
volumes:
|
|
- ./traefik/traefik.yml:/etc/traefik/traefik.yml:ro
|
|
- ./traefik/dynamic.yml:/etc/traefik/dynamic.yml:ro
|
|
networks:
|
|
- scadabridge-net
|
|
restart: unless-stopped
|
|
|
|
networks:
|
|
scadabridge-net:
|
|
external: true
|