wip

Author: mrnicegyu11

services/traefik/docker-compose.local.yml

@@ -1,5 +1,8 @@
 services:
   traefik:
+    volumes:
+      # So that Traefik can listen to the Docker events
+      - /var/run/docker.sock:/var/run/docker.sock
     networks:
       public:
       monitored:
@@ -10,8 +13,6 @@ services:
     deploy:
       placement:
         constraints: []
-    env_file:
-      - .env
     configs:
       - source: traefik_dynamic_config.yml
         target: /etc/traefik/dynamic_conf.yml

services/traefik/docker-compose.yml.j2

@@ -36,7 +36,9 @@ services:
     volumes:
       # So that Traefik can listen to the Docker events
       - /var/run/docker.sock:/var/run/docker.sock
+    {% if MACHINE_FQDN|lower != "osparc.local"%}
       - /etc/traefik_certs:/etc/traefik_certs
+    {% endif %}
     deploy:
       # mode: global
       replicas: ${OPS_TRAEFIK_REPLICAS}

services/traefik/template.env

@@ -22,7 +22,8 @@ RFC2136_POLLING_INTERVAL=${RFC2136_POLLING_INTERVAL}
 ROUTE53_DNS_CHALLANGE_ACCESS_KEY=${ROUTE53_DNS_CHALLANGE_ACCESS_KEY}
 ROUTE53_DNS_CHALLANGE_SECRET_KEY=${ROUTE53_DNS_CHALLANGE_SECRET_KEY}
 
-
+OPS_TRAEFIK_EXPOSE_POSTGRES=${OPS_TRAEFIK_EXPOSE_POSTGRES}
+OPS_TRAEFIK_EXPOSE_RABBITMQ=${OPS_TRAEFIK_EXPOSE_RABBITMQ}
 STORAGE_DOMAIN=${STORAGE_DOMAIN}
 REGISTRY_DOMAIN=${REGISTRY_DOMAIN}
 S3_ENDPOINT=${S3_ENDPOINT}
@@ -50,49 +51,49 @@ OPS_TRAEFIK_LOGLEVEL="${OPS_TRAEFIK_LOGLEVEL}"
 # Core Configuration
 TRAEFIK_API_DASHBOARD=true
 TRAEFIK_API_INSECURE=true
-TRAEFIK_CORE_DEFAULTRULESYNTAX="v2"
+TRAEFIK_CORE_DEFAULTRULESYNTAX=v2
 
 # Logging
-TRAEFIK_LOG_FORMAT="json"
-TRAEFIK_ACCESSLOG_FORMAT="json"
-TRAEFIK_ACCESSLOG_FIELDS_DEFAULTMODE="keep"
-TRAEFIK_ACCESSLOG_FIELDS_NAMES_CLIENTUSERNAME="keep"
-TRAEFIK_ACCESSLOG_FIELDS_HEADERS_DEFAULTMODE="keep"
-TRAEFIK_ACCESSLOG_FIELDS_HEADERS_NAMES_USERAGENT="keep"
-TRAEFIK_ACCESSLOG_FIELDS_HEADERS_NAMES_AUTHORIZATION="drop"
-TRAEFIK_ACCESSLOG_FIELDS_HEADERS_NAMES_CONTENTTYPE="keep"
+TRAEFIK_LOG_FORMAT=json
+TRAEFIK_ACCESSLOG_FORMAT=json
+TRAEFIK_ACCESSLOG_FIELDS_DEFAULTMODE=keep
+TRAEFIK_ACCESSLOG_FIELDS_NAMES_CLIENTUSERNAME=keep
+TRAEFIK_ACCESSLOG_FIELDS_HEADERS_DEFAULTMODE=keep
+TRAEFIK_ACCESSLOG_FIELDS_HEADERS_NAMES_USERAGENT=keep
+TRAEFIK_ACCESSLOG_FIELDS_HEADERS_NAMES_AUTHORIZATION=drop
+TRAEFIK_ACCESSLOG_FIELDS_HEADERS_NAMES_CONTENTTYPE=keep
 TRAEFIK_ACCESSLOG="${OPS_TRAEFIK_ACCESSLOG_ENABLED}"
 # Metrics
 TRAEFIK_METRICS_PROMETHEUS_ADDENTRYPOINTSLABELS=true
 TRAEFIK_METRICS_PROMETHEUS_ADDSERVICESLABELS=true
-TRAEFIK_METRICS_PROMETHEUS_ENTRYPOINT="metrics"
+TRAEFIK_METRICS_PROMETHEUS_ENTRYPOINT=metrics
 
 # EntryPoints
-TRAEFIK_ENTRYPOINTS_HTTP_ADDRESS=":80"
-TRAEFIK_ENTRYPOINTS_HTTP_HTTP_REDIRECTIONS_ENTRYPOINT_TO="https"
-TRAEFIK_ENTRYPOINTS_HTTP_HTTP_REDIRECTIONS_ENTRYPOINT_SCHEME="https"
+TRAEFIK_ENTRYPOINTS_HTTP_ADDRESS=:80
+TRAEFIK_ENTRYPOINTS_HTTP_HTTP_REDIRECTIONS_ENTRYPOINT_TO=https
+TRAEFIK_ENTRYPOINTS_HTTP_HTTP_REDIRECTIONS_ENTRYPOINT_SCHEME=https
 TRAEFIK_ENTRYPOINTS_HTTP_HTTP_REDIRECTIONS_ENTRYPOINT_PERMANENT=true
-TRAEFIK_ENTRYPOINTS_HTTP_TRANSPORT_RESPONDINGTIMEOUTS_WRITETIMEOUT="21600s"
-TRAEFIK_ENTRYPOINTS_HTTP_TRANSPORT_RESPONDINGTIMEOUTS_READTIMEOUT="21600s"
-TRAEFIK_ENTRYPOINTS_HTTPS_ADDRESS=":443"
-TRAEFIK_ENTRYPOINTS_HTTPS_TRANSPORT_RESPONDINGTIMEOUTS_WRITETIMEOUT="21600s"
-TRAEFIK_ENTRYPOINTS_HTTPS_TRANSPORT_RESPONDINGTIMEOUTS_READTIMEOUT="21600s"
-TRAEFIK_ENTRYPOINTS_PING_ADDRESS=":9082"
-TRAEFIK_PING_ENTRYPOINT="ping"
+TRAEFIK_ENTRYPOINTS_HTTP_TRANSPORT_RESPONDINGTIMEOUTS_WRITETIMEOUT=21600s
+TRAEFIK_ENTRYPOINTS_HTTP_TRANSPORT_RESPONDINGTIMEOUTS_READTIMEOUT=21600s
+TRAEFIK_ENTRYPOINTS_HTTPS_ADDRESS=:443
+TRAEFIK_ENTRYPOINTS_HTTPS_TRANSPORT_RESPONDINGTIMEOUTS_WRITETIMEOUT=21600s
+TRAEFIK_ENTRYPOINTS_HTTPS_TRANSPORT_RESPONDINGTIMEOUTS_READTIMEOUT=21600s
+TRAEFIK_ENTRYPOINTS_PING_ADDRESS=:9082
+TRAEFIK_PING_ENTRYPOINT=ping
 TRAEFIK_PING=true
-TRAEFIK_ENTRYPOINTS_METRICS_ADDRESS=":8082"
-TRAEFIK_ENTRYPOINTS_POSTGRES_ADDRESS=":5432"
-TRAEFIK_ENTRYPOINTS_RABBIT_ADDRESS=":5672"
+TRAEFIK_ENTRYPOINTS_METRICS_ADDRESS=:8082
+TRAEFIK_ENTRYPOINTS_POSTGRES_ADDRESS=:5432
+TRAEFIK_ENTRYPOINTS_RABBIT_ADDRESS=:5672
 TRAEFIK_ENTRYPOINTS_REDIS_ADDRESS=${REDIS_EXTERNAL_PORT}
 
 # Providers
-TRAEFIK_PROVIDERS_SWARM_ENDPOINT="unix:///var/run/docker.sock"
+TRAEFIK_PROVIDERS_SWARM_ENDPOINT=unix:///var/run/docker.sock
 TRAEFIK_PROVIDERS_SWARM_EXPOSEDBYDEFAULT=false
-TRAEFIK_PROVIDERS_SWARM_CONSTRAINTS="!LabelRegex(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
-TRAEFIK_PROVIDERS_FILE_DIRECTORY="/etc/traefik/dynamic"
+TRAEFIK_PROVIDERS_SWARM_CONSTRAINTS='!LabelRegex(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)'
+TRAEFIK_PROVIDERS_FILE_DIRECTORY=/etc/traefik/dynamic
 TRAEFIK_PROVIDERS_FILE_WATCH=true
 
 # Tracing
 TRAEFIK_TRACING_ADDINTERNALS=false
-TRAEFIK_TRACING_OTLP_HTTP_ENDPOINT="${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT}"
+TRAEFIK_TRACING_OTLP_HTTP_ENDPOINT=${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
 TRAEFIK_TRACING_SERVICENAME=ops-traefik