From e19e325c65e6453b03c2462615785fdd1f0873a5 Mon Sep 17 00:00:00 2001
From: Colin Hebert <hebert.colin@gmail.com>
Date: Wed, 28 Dec 2022 18:48:31 +0100
Subject: [PATCH] Simplify DDClient setup

---
 mounts/ddclient/{data => cont-init}/entrypoint.sh |  6 +-----
 utilities.docker-compose.yml                      | 14 ++++++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)
 rename mounts/ddclient/{data => cont-init}/entrypoint.sh (89%)

diff --git a/mounts/ddclient/data/entrypoint.sh b/mounts/ddclient/cont-init/entrypoint.sh
similarity index 89%
rename from mounts/ddclient/data/entrypoint.sh
rename to mounts/ddclient/cont-init/entrypoint.sh
index 67c5338..69efc07 100755
--- a/mounts/ddclient/data/entrypoint.sh
+++ b/mounts/ddclient/cont-init/entrypoint.sh
@@ -21,13 +21,9 @@ file_env() {
 	unset "$fileVar"
 }
 
-cd /app
-
-
 apk add --update gettext
 
 file_env 'GOTIFY_TOKEN'
 file_env 'CLOUDFLARE_TOKEN'
-envsubst < /config/ddclient.conf.tpl > /config/ddclient.conf
 
-/init "$@"
+envsubst < /config/ddclient.conf.tpl > /ddclient.conf
diff --git a/utilities.docker-compose.yml b/utilities.docker-compose.yml
index 504f9b4..b906c10 100644
--- a/utilities.docker-compose.yml
+++ b/utilities.docker-compose.yml
@@ -43,9 +43,10 @@ services:
       - gotify
     volumes:
       - ddclient_data:/data
+      - ddclient_init:/custom-cont-init.d:ro
     configs:
-      - source: ddclient
-        target: /config/ddclient.conf.tpl
+      - source: ddclient_config
+        target: /config/
     secrets:
       - source: ddclient_gotify_token
         target: gotify_token
@@ -72,12 +73,17 @@ volumes:
       type: none
       o: bind
       device: ${MOUNT_DIR?}/ddclient/data/
+  ddclient_init:
+    driver_opts:
+      type: none
+      o: bind
+      device: ${MOUNT_DIR?}/ddclient/cont-init/
 
 configs:
 #  smokeping:
 #    file: ${MOUNT_DIR?}/smokeping/config/
-  ddclient:
-    file: ${MOUNT_DIR?}/ddclient/config/ddclient.conf.tpl
+  ddclient_config:
+    file: ${MOUNT_DIR?}/ddclient/config/
 
 secrets:
   watchtower_gotify_token: