diff --git a/services/docker-compose.yml b/services/docker-compose.yml index b573d8f0569..ac9ce380072 100644 --- a/services/docker-compose.yml +++ b/services/docker-compose.yml @@ -186,14 +186,14 @@ services: - traefik.http.services.${SWARM_STACK_NAME}_legacy_services_catchall.loadbalancer.healthcheck.path=/some/invalid/path/to/generate/a/503 - traefik.http.services.${SWARM_STACK_NAME}_legacy_services_catchall.loadbalancer.healthcheck.interval=500s - traefik.http.services.${SWARM_STACK_NAME}_legacy_services_catchall.loadbalancer.healthcheck.timeout=1ms - # TODO: ANE once the dynamic sidecar powered jupyter lab is around we can activate this # see [#2718](https://github.com/ITISFoundation/osparc-simcore/issues/2718) # catchall for modern services (this happens if a backend disappears and a frontend tries to reconnect, the right return value is a 503) - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.service=${SWARM_STACK_NAME}_modern_services_catchall - - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.priority=1 + # the priority is set the same as the webserver, the webserver is the fallback to everything and has prio 2 + - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.priority=2 - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.entrypoints=http - # Please review this regexp, I was trying to match https://7f8a1880-64a8-4c8a-afe1-92d5a6deb98e.services.osparc-master.speag.com. Not sure if dy-proxy and dy-sidecar need to be added - - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.rule=hostregexp(`\b[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}\b}.services.{host:.+}`) + # in theory the pattern should be uuid.services.OSPARC_DOMAIN, but anything could go through.. so let's catch everything + - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.rule=hostregexp(`{node_uuid:.+}.services.{host:.+}`) # this tricks traefik into a 502 (bad gateway) since the service does not exist on this port - traefik.http.services.${SWARM_STACK_NAME}_modern_services_catchall.loadbalancer.server.port=0 # this tricks traefik into returning a 503 (service unavailable) since the healthcheck will always return false