From 5bf6a8630c1cf0f182a09d4fff1ede72871f897e Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 24 Nov 2021 16:25:16 +0100
Subject: [PATCH 1/4] chore(Traefik): Upgrade to 2.5.4

https://github.com/traefik/traefik/releases/tag/v2.5.4
---
 traefik/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 967bfaf..8abba1f 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -11,7 +11,7 @@ networks:
 services:
   traefik:
     container_name: ${TRAEFIK_CONTAINER_NAME:-traefik}
-    image: ${TRAEFIK_IMAGE:-traefik:v2.5.3}
+    image: ${TRAEFIK_IMAGE:-traefik:v2.5.4}
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock

From b40f9ddde21bb3bd0a1d678adb4c229278ec5991 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 24 Nov 2021 16:28:03 +0100
Subject: [PATCH 2/4] refactor(Traefik): Change syntax to accept variable

---
 traefik/docker-compose.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 8abba1f..b7864e2 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -43,9 +43,7 @@ services:
       - --entrypoints.web.address=:80
       - --entryPoints.web.forwardedHeaders.insecure
     labels:
-      traefik.enable: 'true'
-
-      traefik.http.routers.traefik.rule: 'Host(`${TRAEFIK_DOMAIN:?err}`)'
-      traefik.http.routers.traefik.entrypoints: 'web'
-
-      traefik.http.services.traefik.loadbalancer.server.port: '8080'
+      - traefik.enable=true
+      - traefik.http.routers.traefik.rule=Host(`${TRAEFIK_DOMAIN:?err}`)
+      - traefik.http.routers.traefik.entrypoints=web
+      - traefik.http.services.traefik.loadbalancer.server.port=8080

From 185dc3262586d6bc624a919c8dbdef5ec707da17 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 24 Nov 2021 16:30:03 +0100
Subject: [PATCH 3/4] feat(Traefik): Add variable to configure traefik router
 name

---
 traefik/docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index b7864e2..2fcc7b0 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -38,12 +38,12 @@ services:
       - --providers.docker.exposedbydefault=false
       - --providers.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
 
-      - --entryPoints.traefik.address=:8080
+      - --entryPoints.${TRAEFIK_ROUTER_NAME:-traefik}.address=:8080
 
       - --entrypoints.web.address=:80
       - --entryPoints.web.forwardedHeaders.insecure
     labels:
       - traefik.enable=true
-      - traefik.http.routers.traefik.rule=Host(`${TRAEFIK_DOMAIN:?err}`)
-      - traefik.http.routers.traefik.entrypoints=web
-      - traefik.http.services.traefik.loadbalancer.server.port=8080
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-traefik}.rule=Host(`${TRAEFIK_DOMAIN:?err}`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-traefik}.entrypoints=web
+      - traefik.http.services.${TRAEFIK_ROUTER_NAME:-traefik}.loadbalancer.server.port=8080

From 57283af5af8adbb741fb608eb113a569817f8268 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 24 Nov 2021 16:31:11 +0100
Subject: [PATCH 4/4] feat(Traefik): Add variable to configure traefik
 entrypoints name

---
 traefik/docker-compose.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 2fcc7b0..acdb18c 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -40,10 +40,10 @@ services:
 
       - --entryPoints.${TRAEFIK_ROUTER_NAME:-traefik}.address=:8080
 
-      - --entrypoints.web.address=:80
-      - --entryPoints.web.forwardedHeaders.insecure
+      - --entrypoints.${TRAEFIK_ENTRYPOINTS:-web}.address=:80
+      - --entryPoints.${TRAEFIK_ENTRYPOINTS:-web}.forwardedHeaders.insecure
     labels:
       - traefik.enable=true
       - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-traefik}.rule=Host(`${TRAEFIK_DOMAIN:?err}`)
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-traefik}.entrypoints=web
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-traefik}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
       - traefik.http.services.${TRAEFIK_ROUTER_NAME:-traefik}.loadbalancer.server.port=8080