traefik on docker update

ChristianLempa · May 24, 2024 · c7b8a49 · c7b8a49
1 parent a3d3b94
commit c7b8a49
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 40 deletions.
diff --git a/teleport/teleport-demo-1/docker-compose.yaml b/teleport/teleport-demo-1/docker-compose.yaml
@@ -6,24 +6,21 @@ services:
   teleport:
     image: public.ecr.aws/gravitational/teleport-distroless-debug:15.1.4
     container_name: teleport-demo-1
-    ports:
-      - "3080:3080"
-      - "3023:3023"
-      - "3024:3024"
-      - "3025:3025"
     volumes:
       - ./config:/etc/teleport
       - ./data:/var/lib/teleport
     labels:
-      traefik.enable: "true"
-      traefik.http.services.teleport-demo-1.loadbalancer.server.port: "3080"
-      traefik.http.services.teleport-demo-1.loadbalancer.server.scheme: "https"
-      traefik.http.routers.teleport-demo-1-http.entrypoints: "web"
-      traefik.http.routers.teleport-demo-1-http.rule: "Host(`teleport-demo-1.srv-prod-1.home.clcreative.de`)"
-      traefik.http.routers.teleport-demo-1-https.entrypoints: "websecure"
-      traefik.http.routers.teleport-demo-1-https.rule: "Host(`teleport-demo-1.srv-prod-1.home.clcreative.de`)"
-      traefik.http.routers.teleport-demo-1-https.tls: "true"
-      traefik.http.routers.teleport-demo-1-https.tls.certresolver: "cloudflare"
+      - "traefik.enable=true"
+      - "traefik.http.services.teleport-demo-1.loadbalancer.server.port=3080"
+      - "traefik.http.services.teleport-demo-1.loadbalancer.server.scheme=https"
+      - "traefik.http.routers.teleport-demo-1-http.entrypoints=web"
+      - "traefik.http.routers.teleport-demo-1-http.rule=Host(`teleport-demo-1.srv-prod-1.home.clcreative.de`) || HostRegexp(`{subhost:[a-z]+}.teleport-demo-1.srv-prod-1.home.clcreative.de`)"
+      - "traefik.http.routers.teleport-demo-1-https.entrypoints=websecure"
+      - "traefik.http.routers.teleport-demo-1-https.rule=Host(`teleport-demo-1.srv-prod-1.home.clcreative.de`) || HostRegexp(`{subhost:[a-z]+}.teleport-demo-1.srv-prod-1.home.clcreative.de`)"
+      - "traefik.http.routers.teleport-demo-1-https.tls=true"
+      - "traefik.http.routers.teleport-demo-1-https.tls.certresolver=cloudflare"
+      - "traefik.http.routers.teleport-demo-1-https.tls.domains[0].main=teleport-demo-1.srv-prod-1.home.clcreative.de"
+      - "traefik.http.routers.teleport-demo-1-https.tls.domains[0].sans=*.teleport-demo-1.srv-prod-1.home.clcreative.de"
     networks:
       - frontend
-    restart: unless-stopped
+    restart: unless-stopped
diff --git a/traefik/traefik-demo-1/config/conf/headers.yaml b/traefik/traefik-demo-1/config/conf/headers.yaml
diff --git a/traefik/traefik-demo-1/config/conf/headers.yml b/traefik/traefik-demo-1/config/conf/headers.yml
diff --git a/traefik/traefik-demo-1/config/conf/tls.yml → traefik/traefik-demo-1/config/conf/tls.yaml b/traefik/traefik-demo-1/config/conf/tls.yml → traefik/traefik-demo-1/config/conf/tls.yaml
diff --git a/traefik/traefik-demo-1/config/traefik.yaml b/traefik/traefik-demo-1/config/traefik.yaml
@@ -2,6 +2,8 @@ global:
   checkNewVersion: false
   sendAnonymousUsage: false
 
+accessLog: {}
+
 log:
   level: DEBUG
 
@@ -42,7 +44,6 @@ providers:
     exposedByDefault: false
     endpoint: 'unix:///var/run/docker.sock'
     watch: true
-    swarmMode: false
   file:
     directory: /etc/traefik/conf/
     watch: true
diff --git a/traefik/traefik-demo-1/docker-compose.yaml b/traefik/traefik-demo-1/docker-compose.yaml
@@ -7,7 +7,7 @@ networks:
 services:
   traefik:
     container_name: traefik-demo-1
-    image: traefik:2.10.5
+    image: traefik:3.0.1
     ports:
       - 80:80
       - 443:443

diff --git a/traefik/traefik-prod-1/docker-compose.yaml b/traefik/traefik-prod-1/docker-compose.yaml
@@ -7,7 +7,7 @@ networks:
 services:
   traefik:
     container_name: traefik-prod-1
-    image: traefik:3.0
+    image: traefik:3.0.1
     ports:
       - 80:80
       - 443:443

diff --git a/traefik/traefik-prod-2/config/traefik.yaml b/traefik/traefik-prod-2/config/traefik.yaml
@@ -47,7 +47,6 @@ providers:
     exposedByDefault: false
     endpoint: 'unix:///var/run/docker.sock'
     watch: true
-    swarmMode: false
   file:
     directory: /etc/traefik
     watch: true
diff --git a/traefik/traefik-prod-2/docker-compose.yaml b/traefik/traefik-prod-2/docker-compose.yaml
@@ -7,7 +7,7 @@ networks:
 services:
   traefik:
     container_name: traefik-prod-2
-    image: traefik:2.10.4
+    image: traefik:3.0.1
     ports:
       - 80:80
       - 443:443