Disable traefik docker exposed by default

FRINXio · Dec 6, 2023 · 6069bbb · 6069bbb
1 parent 2ca3b44
commit 6069bbb
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 27 deletions.
diff --git a/composefiles/swarm-kafka-connector.yml b/composefiles/swarm-kafka-connector.yml
@@ -19,8 +19,7 @@ x-placement: &placement
         constraints:
           - node.role == manager
 
-x-traefik-label: &traefik_kafka_labels
-      - traefik.enable=false
+x-traefik-label: &kafka_labels
       - kafka=frinx
 
 services:
@@ -61,7 +60,7 @@ services:
     cap_drop:
       - all
     deploy:
-      labels: *traefik_kafka_labels
+      labels: *kafka_labels
       <<: *placement
       restart_policy:
         condition: any

diff --git a/composefiles/swarm-uniconfig.yml b/composefiles/swarm-uniconfig.yml
@@ -37,9 +37,6 @@ x-placement-postgres: &placement-postgres
 x-tcp_keepalive: &tcp_keepalive
       net.ipv4.tcp_keepalive_time: 300
 
-x-traefik-label: &traefik_labels
-      - traefik.enable=false
-
 services:
   uniconfig:
     image: traefik:v2.7
@@ -64,6 +61,7 @@ services:
       - TRAEFIK_ENTRYPOINTS_CLISHELL=true
       - TRAEFIK_ENTRYPOINTS_CLISHELL_ADDRESS=:2022
       - TRAEFIK_PROVIDERS_DOCKER_SWARMMODE=true
+      - TRAEFIK_PROVIDERS_DOCKER_EXPOSEDBYDEFAULT=false
       - TRAEFIK_PROVIDERS_DOCKER_WATCH=true
       - TRAEFIK_SERVERSTRANSPORT_ROOTCAS=/run/secrets/frinx_uniconfig_tls_cert.pem
       - TRAEFIK_SERVERSTRANSPORT_INSECURESKIPVERIFY=true
@@ -217,8 +215,6 @@ services:
     logging: *logging_loki
     networks:
       - uniconfig-network
-    labels:
-      - traefik.enable=false  
     volumes:
       - frinx_uniconfig-postgresql_data:/var/lib/postgresql/data
     secrets:
@@ -266,7 +262,6 @@ services:
     sysctls:
       <<: *tcp_keepalive
     deploy: 
-      labels: *traefik_labels
       <<: *placement-postgres
       restart_policy:
         condition: any

diff --git a/composefiles/swarm-unistore.yml b/composefiles/swarm-unistore.yml
@@ -27,15 +27,10 @@ x-placement: &placement
 x-tcp_keepalive: &tcp_keepalive
       net.ipv4.tcp_keepalive_time: 300
 
-x-traefik-label: &traefik_labels
-      - traefik.enable=false
-
 services:
   unistore:
     image: frinx/uniconfig:5.1.5
     logging: *logging_loki
-    labels:
-      - traefik.enable=false  
     environment:
       - CONTAINER_ID={{.Task.Slot}}
       - SERVICE_NAME={{.Service.Name}}
@@ -94,7 +89,6 @@ services:
     sysctls:
       <<: *tcp_keepalive
     deploy: 
-      labels: *traefik_labels
       <<: *placement
       restart_policy:
         condition: any

diff --git a/composefiles/swarm-workflow-manager.yml b/composefiles/swarm-workflow-manager.yml
@@ -20,9 +20,6 @@ x-placement: &placement
         constraints:
           - node.role == manager
 
-x-traefik-label: &traefik_labels
-      - traefik.enable=false
-
 x-tcp_keepalive: &tcp_keepalive
       net.ipv4.tcp_keepalive_time: 300
 
@@ -110,7 +107,6 @@ services:
     cap_drop:
       - all
     deploy:
-      labels: *traefik_labels
       <<: *placement
       restart_policy:
         condition: any
@@ -159,7 +155,6 @@ services:
     sysctls:
       <<: *tcp_keepalive
     deploy:
-      labels: *traefik_labels
       <<: *placement
       restart_policy:
         condition: any
@@ -216,7 +211,6 @@ services:
     cap_drop:
       - all
     deploy:
-      labels: *traefik_labels
       <<: *placement
       restart_policy:
         condition: any
@@ -267,7 +261,6 @@ services:
     sysctls:
       <<: *tcp_keepalive
     deploy:
-      labels: *traefik_labels
       <<: *placement
       restart_policy:
         condition: any
@@ -314,7 +307,6 @@ services:
     sysctls:
       <<: *tcp_keepalive
     deploy:
-      labels: *traefik_labels
       <<: *placement
       restart_policy:
         condition: any
@@ -358,7 +350,6 @@ services:
     cap_drop:
       - all
     deploy:
-      labels: *traefik_labels
       <<: *placement
       restart_policy:
         condition: any
@@ -404,7 +395,6 @@ services:
     sysctls:
       <<: *tcp_keepalive
     deploy:
-      labels: *traefik_labels
       <<: *placement
       restart_policy:
         condition: any
@@ -454,7 +444,6 @@ services:
     cap_drop:
       - all
     deploy:
-      labels: *traefik_labels
       <<: *placement
       restart_policy:
         condition: any
@@ -496,7 +485,6 @@ services:
     cap_drop:
       - all
     deploy:
-      labels: *traefik_labels
       <<: *placement
       restart_policy:
         condition: any