From 9dd36f340de2e3ae282a0a3e348e89d5feb031f3 Mon Sep 17 00:00:00 2001 From: YuryHrytsuk Date: Fri, 18 Oct 2024 09:59:43 +0200 Subject: [PATCH 1/2] inhouse tip: fix postgres route --- .../simcore/docker-compose.deploy.public.yml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/services/simcore/docker-compose.deploy.public.yml b/services/simcore/docker-compose.deploy.public.yml index 730f0f94..2ac6f6cf 100644 --- a/services/simcore/docker-compose.deploy.public.yml +++ b/services/simcore/docker-compose.deploy.public.yml @@ -16,6 +16,42 @@ services: static-webserver: hostname: "{{.Node.Hostname}}-{{.Service.Name}}" traefik: + command: + - "--api=true" + - "--api.dashboard=true" + - "--ping=true" + - "--entryPoints.ping.address=:9082" + - "--ping.entryPoint=ping" + - "--log.level=${SIMCORE_TRAEFIK_LOGLEVEL}" + - "--accesslog=false" + - "--metrics.prometheus=true" + - "--metrics.prometheus.addEntryPointsLabels=true" + - "--metrics.prometheus.addServicesLabels=true" + - "--entryPoints.metrics.address=:8082" + - "--metrics.prometheus.entryPoint=metrics" + - "--entryPoints.http.address=:80" + - "--entryPoints.http.forwardedHeaders.insecure" + - "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 + - "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 + - "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 - "--entryPoints.simcore_api.address=:10081" + - "--entryPoints.postgres.address=:5432" + - "--entryPoints.simcore_api.address=:10081" + - "--entryPoints.simcore_api.forwardedHeaders.insecure" + - "--entryPoints.simcore_api.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 + - "--entryPoints.simcore_api.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 + - "--entryPoints.simcore_api.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 + - "--entryPoints.traefik_monitor.address=:8080" + - "--entryPoints.traefik_monitor.forwardedHeaders.insecure" + - "--providers.swarm.endpoint=unix:///var/run/docker.sock" + - "--providers.swarm.network=${SWARM_STACK_NAME}_default" + # https://github.com/traefik/traefik/issues/7886 + - "--providers.swarm.refreshSeconds=1" + - "--providers.swarm.exposedByDefault=false" + - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)" + - "--tracing" + - "--tracing.addinternals" + - "--tracing.otlp=true" + - "--tracing.otlp.http=true" deploy: labels: - prometheus-job=traefik_simcore_production From 3c675d7747f4713a622fa2afeb1ca4e02d602373 Mon Sep 17 00:00:00 2001 From: YuryHrytsuk Date: Wed, 6 Nov 2024 16:08:56 +0100 Subject: [PATCH 2/2] remove stale comment --- services/simcore/docker-compose.deploy.public.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/simcore/docker-compose.deploy.public.yml b/services/simcore/docker-compose.deploy.public.yml index 2ac6f6cf..fe97ef83 100644 --- a/services/simcore/docker-compose.deploy.public.yml +++ b/services/simcore/docker-compose.deploy.public.yml @@ -33,7 +33,7 @@ services: - "--entryPoints.http.forwardedHeaders.insecure" - "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 - "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 - - "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 - "--entryPoints.simcore_api.address=:10081" + - "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 - "--entryPoints.postgres.address=:5432" - "--entryPoints.simcore_api.address=:10081" - "--entryPoints.simcore_api.forwardedHeaders.insecure"