From 51d997c6bae2da42d96421a114779a3e61072329 Mon Sep 17 00:00:00 2001
From: yorickdowne <71337066+yorickdowne@users.noreply.github.com>
Date: Mon, 31 Jul 2023 11:35:19 +0100
Subject: [PATCH] Configurable traefik and ddns tags (#1458)

---
 default.env        | 4 ++++
 ethd               | 2 +-
 traefik-aws.yml    | 2 ++
 traefik-cf.yml     | 4 ++--
 traefik/Dockerfile | 3 ++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/default.env b/default.env
index f419cbff..979c36b3 100644
--- a/default.env
+++ b/default.env
@@ -238,5 +238,9 @@ DEPCLI_SRC_BUILD_TARGET='$(git describe --tags $(git rev-list --tags --max-count
 # Does not (yet?) exist on Docker hub
 DEPCLI_DOCKER_TAG=nonesuch
 
+# traefik and cf-ddns
+TRAEFIK_TAG=v2.10
+DDNS_TAG=3
+
 # For the Node Dashboard, define a regex of mount points to ignore for the diskspace check.
 NODE_EXPORTER_IGNORE_MOUNT_REGEX='^/(dev|proc|sys|run|var/lib/docker/.+)($|/)'
diff --git a/ethd b/ethd
index dc54a472..081eac77 100755
--- a/ethd
+++ b/ethd
@@ -669,7 +669,7 @@ envmigrate() {
                 TEKU_DOCKERFILE LH_SRC_BUILD_TARGET LH_DOCKER_TAG LH_DOCKERFILE PRYSM_SRC_BUILD_TARGET \
                 PRYSM_DOCKER_TAG PRYSM_DOCKER_VC_TAG PRYSM_DOCKERFILE ERIGON_SRC_BUILD_TARGET ERIGON_DOCKER_TAG \
                 ERIGON_DOCKERFILE MEV_DOCKERFILE MEV_DOCKER_TAG NIMEL_SRC_BUILD_TARGET NIMEL_DOCKER_TAG NIMEL_DOCKERFILE \
-                LS_SRC_BUILD_TARGET LS_DOCKER_TAG LS_DOCKERFILE GETH_SRC_BUILD_TARGET GETH_DOCKER_TAG \
+                LS_SRC_BUILD_TARGET LS_DOCKER_TAG LS_DOCKERFILE GETH_SRC_BUILD_TARGET GETH_DOCKER_TAG TRAEFIK_TAG DDNS_TAG \
                 GETH_DOCKERFILE NM_SRC_BUILD_TARGET NM_DOCKER_TAG NM_DOCKERFILE BESU_SRC_BUILD_TARGET \
                 BESU_DOCKER_TAG BESU_DOCKERFILE SSV2_NODE_TAG DEPCLI_SRC_BUILD_TARGET DEPCLI_DOCKER_TAG W3S_DOCKER_TAG \
                 PG_DOCKER_TAG RETH_SRC_BUILD_TARGET RETH_DOCKER_TAG RETH_DOCKERFILE NODE_EXPORTER_IGNORE_MOUNT_REGEX )
diff --git a/traefik-aws.yml b/traefik-aws.yml
index f2ab8392..57b73526 100644
--- a/traefik-aws.yml
+++ b/traefik-aws.yml
@@ -12,6 +12,8 @@ services:
     image: traefik-aws
     build:
       context: ./traefik
+      args:
+        - DOCKER_TAG=${TRAEFIK_TAG}
     restart: "unless-stopped"
     command:
 #      - --accesslog=true
diff --git a/traefik-cf.yml b/traefik-cf.yml
index db7c0434..b5e92c97 100644
--- a/traefik-cf.yml
+++ b/traefik-cf.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   traefik:
-    image: traefik:v2.10
+    image: traefik:${TRAEFIK_TAG}
     restart: "unless-stopped"
     command:
 #      - --accesslog=true
@@ -47,7 +47,7 @@ services:
     <<: *logging
 
   cf-ddns:
-    image: ghcr.io/joshuaavalon/cloudflare-ddns:3
+    image: ghcr.io/joshuaavalon/cloudflare-ddns:${DDNS_TAG}
     restart: "unless-stopped"
     environment:
       - CF_DNS__LOG_LEVEL=${LOG_LEVEL:-info}
diff --git a/traefik/Dockerfile b/traefik/Dockerfile
index e70b10e3..77d2ef05 100644
--- a/traefik/Dockerfile
+++ b/traefik/Dockerfile
@@ -1,6 +1,7 @@
 # Add AWS CLI to traefik image
+ARG DOCKER_TAG
 
-FROM traefik:v2.10
+FROM traefik:${DOCKER_TAG}
 
 RUN apk add --no-cache \
         python3 \