Merge branch 'main' into upstream-main

Author: noadc-dev

CHANGELOG.MD

@@ -0,0 +1,6 @@
+# Changelog
+
+## [Unreleased]
+### Added
+- **Docker Secrets Support:** `entrypoint.py` now correctly reads `_FILE` environment variables, allowing API keys to be securely injected via Docker secrets.
+- **Improved Configuration Handling:** `entrypoint.py` now uses `get_secret_from_env()` to correctly retrieve API keys from either environment variables or secret files.

Docker/entrypoint.py

@@ -1,58 +1,52 @@
-import os
-import sys
 import logging
-from time import sleep
-from porkbun_ddns import PorkbunDDNS
-from porkbun_ddns.config import Config, DEFAULT_ENDPOINT
-
-logger = logging.getLogger('porkbun_ddns')
-if os.getenv('DEBUG', 'False').lower() in ('true', '1', 't'):
-    logger.setLevel(logging.DEBUG)
-else:
-    logger.setLevel(logging.INFO)
-logger.propagate = False
-logFormatter = logging.Formatter("%(asctime)s %(levelname)-8s %(message)s")
-consoleHandler = logging.StreamHandler(sys.stdout)
-consoleHandler.setFormatter(logFormatter)
-logger.addHandler(consoleHandler)
-
-sleep_time = int(os.getenv('SLEEP', 300))
-domain = os.getenv('DOMAIN', None)
-
-if os.getenv('IPV4_ONLY', None) or os.getenv('IPV6_ONLY', None):
-    raise PorkbunDDNS_Error('IPV4_ONLY and IPV6_ONLY are DEPRECATED and have been removed since v1.1.0')
-
-public_ips = None
-if os.getenv('PUBLIC_IPS', None):
-    public_ips = [x.strip() for x in os.getenv('PUBLIC_IPS', None).split(',')]
-fritzbox = os.getenv('FRITZBOX', None)
+import sys
+import os
+import time
+from porkbun_ddns.config import Config, get_secret_from_env, DEFAULT_ENDPOINT
+from porkbun_ddns.porkbun_ddns import PorkbunDDNS
 
-config = Config(DEFAULT_ENDPOINT, os.getenv('APIKEY'), os.getenv('SECRETAPIKEY'))
+logger = logging.getLogger("porkbun_ddns")
+logging.basicConfig(level=logging.INFO)
 
-ipv4 = ipv6 = False
-if os.getenv('IPV4', 'True').lower() in ('true', '1', 't'):
-    ipv4 = True
-if os.getenv('IPV6', 'False').lower() in ('true', '1', 't'):
-    ipv6 = True
+def main():
+    domain = os.getenv("DOMAIN")
+    apikey = get_secret_from_env("APIKEY")
+    secretapikey = get_secret_from_env("SECRETAPIKEY")
 
-if not all([os.getenv('DOMAIN'), os.getenv('SECRETAPIKEY'), os.getenv('APIKEY')]):
-    logger.info('Please set DOMAIN, SECRETAPIKEY and APIKEY')
-    sys.exit(1)
-
-if not any([ipv4, ipv6]):
-    logger.info('No Protocol selected! Please set IPV4 and/or IPV6 TRUE')
-    sys.exit(1)
-
-porkbun_ddns = PorkbunDDNS(config, domain, public_ips=public_ips,
-                           fritzbox_ip=fritzbox, ipv4=ipv4, ipv6=ipv6)
-
-while True:
-    subdomains = os.getenv('SUBDOMAINS', '')
-    if subdomains:
-        for subdomain in subdomains.replace(' ', '').split(','):
-            porkbun_ddns.set_subdomain(subdomain)
-            porkbun_ddns.update_records()
-    else:
-        porkbun_ddns.update_records()
-    logger.info('Sleeping... {}s'.format(sleep_time))
-    sleep(sleep_time)
+    if not all([domain, apikey, secretapikey]):
+        logger.info("Please set DOMAIN, SECRETAPIKEY and APIKEY")
+        sys.exit(1)
+    
+    ipv4 = ipv6 = False
+    if os.getenv('IPV4', 'True').lower() in ('true', '1', 't'):
+        ipv4 = True
+    if os.getenv('IPV6', 'False').lower() in ('true', '1', 't'):
+        ipv6 = True
+    
+    if not any([ipv4, ipv6]):
+        logger.info("No Protocol selected! Please set IPV4 and/or IPV6 TRUE")
+        sys.exit(1)
+    
+    config = Config(endpoint=DEFAULT_ENDPOINT, apikey=apikey, secretapikey=secretapikey)
+    porkbun_ddns = PorkbunDDNS(config, domain, ipv4=ipv4, ipv6=ipv6)
+    
+    logger.info("Starting Porkbun DDNS update process...")
+    try:
+        while True:
+            subdomains = os.getenv('SUBDOMAINS', '')
+            if subdomains:
+                for subdomain in subdomains.replace(' ', '').split(','):
+                    porkbun_ddns.set_subdomain(subdomain)
+                    porkbun_ddns.update_records()
+            else:
+                porkbun_ddns.update_records()
+            
+            sleep_time = int(os.getenv("SLEEP", "300"))
+            logger.info("Sleeping... {}s".format(sleep_time))
+            time.sleep(sleep_time)
+    except Exception as e:
+        logger.error(f"Failed to update DNS records: {e}")
+        sys.exit(1)
+    
+if __name__ == "__main__":
+    main()