From 0145930d55b7d92bf440ba3f25f0e1743b766728 Mon Sep 17 00:00:00 2001
From: Colin Hebert <hebert.colin@gmail.com>
Date: Thu, 29 Dec 2022 11:45:25 +0100
Subject: [PATCH] Use existing FILE__ notation

---
 services/ddclient/volumes/init/entrypoint.sh | 26 --------------------
 utilities.docker-compose.yml                 |  4 +--
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/services/ddclient/volumes/init/entrypoint.sh b/services/ddclient/volumes/init/entrypoint.sh
index 69efc07..f1db6ef 100755
--- a/services/ddclient/volumes/init/entrypoint.sh
+++ b/services/ddclient/volumes/init/entrypoint.sh
@@ -1,29 +1,3 @@
 #!/bin/bash
-
-# usage: file_env VAR [DEFAULT]
-#    ie: file_env 'XYZ_DB_PASSWORD' 'example'
-# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
-#  "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
-file_env() {
-	local var="$1"
-	local fileVar="${var}_FILE"
-	local def="${2:-}"
-	if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
-		mysql_error "Both $var and $fileVar are set (but are exclusive)"
-	fi
-	local val="$def"
-	if [ "${!var:-}" ]; then
-		val="${!var}"
-	elif [ "${!fileVar:-}" ]; then
-		val="$(< "${!fileVar}")"
-	fi
-	export "$var"="$val"
-	unset "$fileVar"
-}
-
 apk add --update gettext
-
-file_env 'GOTIFY_TOKEN'
-file_env 'CLOUDFLARE_TOKEN'
-
 envsubst < /config/ddclient.conf.tpl > /ddclient.conf
diff --git a/utilities.docker-compose.yml b/utilities.docker-compose.yml
index c9bb501..1dcd38f 100644
--- a/utilities.docker-compose.yml
+++ b/utilities.docker-compose.yml
@@ -33,9 +33,9 @@ services:
     image: linuxserver/ddclient
     environment:
       GOTIFY_ADDRESS: http://gotify
-      GOTIFY_TOKEN_FILE: /run/secrets/gotify_token
+      FILE__GOTIFY_TOKEN: /run/secrets/gotify_token
       CLOUDFLARE_DOMAIN: ${DDCLIENT_CLOUDFLARE_DOMAIN-test.dedicated.contact}
-      CLOUDFLARE_TOKEN_FILE: /run/secrets/cloudflare_token
+      FILE__CLOUDFLARE_TOKEN: /run/secrets/cloudflare_token
     networks:
       - gotify
     volumes: