From 48b1cdf519b82ae7019a9d548d3bdb62132ebe50 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 9 Mar 2021 09:30:20 +0100
Subject: [PATCH] feat(Traefik): Add default value in yml

---
 examples/traefik.cool.life/.env |  1 -
 traefik/.env                    |  4 ----
 traefik/docker-compose.yml      | 16 ++++++++--------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/examples/traefik.cool.life/.env b/examples/traefik.cool.life/.env
index 5aaf522..857c68a 100644
--- a/examples/traefik.cool.life/.env
+++ b/examples/traefik.cool.life/.env
@@ -6,5 +6,4 @@ COMPOSE_FILE=../../traefik/docker-compose.yml
 TRAEFIK_VOLUME_NAME=kifeart
 TRAEFIK_NETWORK_NAME=kifeart
 TRAEFIK_CONTAINER_NAME=kifeart
-TRAEFIK_IMAGE=traefik:v2.4.5
 TRAEFIK_DOMAIN=traefik.cool.life
diff --git a/traefik/.env b/traefik/.env
index 9c012df..853885a 100644
--- a/traefik/.env
+++ b/traefik/.env
@@ -1,5 +1 @@
-TRAEFIK_VOLUME_NAME=traefik
-TRAEFIK_NETWORK_NAME=traefik
-TRAEFIK_CONTAINER_NAME=traefik
-TRAEFIK_IMAGE=traefik:v2.4.5
 TRAEFIK_DOMAIN=localhost
diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index d84a224..8bab252 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -2,20 +2,20 @@ version: "3.8"
 
 volumes:
   traefik:
-    name: ${TRAEFIK_VOLUME_NAME}
+    name: ${TRAEFIK_VOLUME_NAME:-traefik}
 
 networks:
   traefik:
-    name: ${TRAEFIK_NETWORK_NAME}
+    name: ${TRAEFIK_NETWORK_NAME:-traefik}
 
 services:
   traefik:
-    container_name: ${TRAEFIK_CONTAINER_NAME}
-    image: ${TRAEFIK_IMAGE}
+    container_name: ${TRAEFIK_CONTAINER_NAME:-traefik}
+    image: ${TRAEFIK_IMAGE:-traefik:v2.4.5}
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ${TRAEFIK_VOLUME_NAME}:/traefik
+      - ${TRAEFIK_VOLUME_NAME:-traefik}:/traefik
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
@@ -24,7 +24,7 @@ services:
         protocol: tcp
         mode: host
     networks:
-      - ${TRAEFIK_NETWORK_NAME}
+      - ${TRAEFIK_NETWORK_NAME:-traefik}
     command:
       - --api.insecure=true
       - --log.level=INFO
@@ -34,14 +34,14 @@ services:
 
       - --providers.docker
       - --providers.docker.exposedbydefault=false
-      - --providers.docker.network=${TRAEFIK_NETWORK_NAME}
+      - --providers.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
 
       - --entrypoints.web.address=:80
       - --entryPoints.web.forwardedHeaders.insecure
     labels:
       traefik.enable: 'true'
 
-      traefik.http.routers.traefik.rule: 'Host(`${TRAEFIK_DOMAIN}`)'
+      traefik.http.routers.traefik.rule: 'Host(`${TRAEFIK_DOMAIN:?err}`)'
       traefik.http.routers.traefik.entrypoints: 'web'
 
       traefik.http.services.traefik.loadbalancer.server.port: '8080'