From 4476c02354afbdcb3eb9c474a322d680d1f701bb Mon Sep 17 00:00:00 2001
From: Chris Cowan <calahilstudio@gmail.com>
Date: Wed, 22 Oct 2025 01:03:35 -0700
Subject: [PATCH] force the ENV

---
 Dockerfile             | 12 +++++++++---
 backupbot.env          |  8 --------
 services/backupbot/run | 12 ------------
 3 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 backupbot.env

diff --git a/Dockerfile b/Dockerfile
index da5ce4d..aa76946 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,9 +19,6 @@ RUN mkdir -p /usr/local/bin /config/log /config/web /etc/services.d/backupbot
 COPY backup.sh /usr/local/bin/backup.sh
 RUN chmod +x /usr/local/bin/backup.sh
 
-# Copy the environment variables for the config
-COPY backupbot.env /defaults/backupbot.env
-
 # Copy s6 service for backupbot
 COPY services/backupbot/run /etc/services.d/backupbot/run
 RUN chmod +x /etc/services.d/backupbot/run
@@ -32,5 +29,14 @@ RUN chmod +x /defaults/web/backupbot.cgi
 # Expose web frontend port
 EXPOSE 8080
 
+ENV TZ=America/Los_Angeles
+ENV BACKUP_DIR=/backups/postgres
+ENV LOG_FILE=/config/log/pgbackup.log
+ENV MAX_RETRIES=3
+ENV GOTIFY_URL=http://gotify.example.com
+ENV GOTIFY_TOKEN=your_gotify_token_here
+ENV BACKUP_HOUR=03
+ENV BACKUP_MINUTE=00
+
 # Keep duplicati entrypoint
 ENTRYPOINT ["/init"]
diff --git a/backupbot.env b/backupbot.env
deleted file mode 100644
index 9e7130d..0000000
--- a/backupbot.env
+++ /dev/null
@@ -1,8 +0,0 @@
-TZ=America/Los_Angeles
-BACKUP_DIR=/backups/postgres
-LOG_FILE=/config/log/pgbackup.log
-MAX_RETRIES=3
-GOTIFY_URL=http://gotify.example.com
-GOTIFY_TOKEN=your_gotify_token_here
-BACKUP_HOUR=03
-BACKUP_MINUTE=00
diff --git a/services/backupbot/run b/services/backupbot/run
index d2a0e79..f613de2 100644
--- a/services/backupbot/run
+++ b/services/backupbot/run
@@ -1,17 +1,5 @@
 #!/usr/bin/with-contenv bash
 set -e
-# Source env if available
-if [[ -f /config/backupbot.env ]]; then
-  set -a
-  source /config/backupbot.env
-  set +a
-else
-  echo "[INFO] copying env vars from defaults..."
-  cp -r /defaults/backupbot.env /config/
-  set -a
-  source /config/backupbot.env
-  set +a
-fi
 # Initialize default web interface if missing
 if [ ! -d /config/web ]; then
   echo "[INFO] Populating /config/web from defaults..."