From 90d18452e9de998ae80bac2c40fffa38a35936e6 Mon Sep 17 00:00:00 2001
From: Mike McFetridge <91107715+mmcfetridge1969@users.noreply.github.com>
Date: Wed, 22 Jul 2026 18:35:02 -0400
Subject: [PATCH] Update Watchtower env

---
 Watchtower/.env               |  8 +++----
 Watchtower/docker-compose.yml | 39 +++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/Watchtower/.env b/Watchtower/.env
index 8e7bfea..1a15f54 100644
--- a/Watchtower/.env
+++ b/Watchtower/.env
@@ -1,11 +1,13 @@
 TZ=America/New_York
+PUID=1000
+PGID=1000
 WATCHTOWER_CLEANUP=true
 WATCHTOWER_INCLUDE_RESTARTING=true
 WATCHTOWER_ROLLING_RESTARTING=true
-WATCHTOWER_SCHEDULE=0 0 4 * * *
+WATCHTOWER_SCHEDULE="0 0 4 * * *"
 WATCHTOWER_INCLUDE_STOPPED=true
 WATCHTOWER_NOTIFICATIONS=email
-WATCHTOWER_NOTIFICATIONS_HOSTNAME=Docker-Deply  # Add Server Name or IP Address
+WATCHTOWER_NOTIFICATIONS_HOSTNAME=Docker-01
 WATCHTOWER_NOTIFICATION_EMAIL_FROM=miker@mmcfetridge.net
 WATCHTOWER_NOTIFICATION_EMAIL_TO=miker@mmcfetridge.net
 WATCHTOWER_NOTIFICATION_EMAIL_SERVER=mail.mmcfetridge.net
@@ -13,5 +15,3 @@ WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=465
 WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=miker@mmcfetridge.net
 WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=!Sucyetat123
 WATCHTOWER_NOTIFICATION_EMAIL_DELAY=2
-PUID=1000
-PGID=1000
\ No newline at end of file
diff --git a/Watchtower/docker-compose.yml b/Watchtower/docker-compose.yml
index 59b7566..9870438 100644
--- a/Watchtower/docker-compose.yml
+++ b/Watchtower/docker-compose.yml
@@ -3,25 +3,27 @@ services:
     image: containrrr/watchtower
     container_name: watchtower
     restart: unless-stopped
+    env_file:
+      - .env
     environment:
       - DOCKER_API_VERSION=1.44
-      - TZ=America/New_York
-      - PUID:=1000 # Reference PUID from .env
-      - PGID=1000 # Reference PGID from .env
-      - WATCHTOWER_CLEANUP=true
-      - WATCHTOWER_INCLUDE_RESTARTING=true
-      - WATCHTOWER_ROLLING_RESTARTING=true
-      - WATCHTOWER_SCHEDULE=0 0 4 * * *
-      - WATCHTOWER_INCLUDE_STOPPED=true
-      - WATCHTOWER_NOTIFICATIONS=email
-      - WATCHTOWER_NOTIFICATIONS_HOSTNAME=Docker-01  # Add Server Name or IP Address
-      - WATCHTOWER_NOTIFICATION_EMAIL_FROM=miker@mmcfetridge.net
-      - WATCHTOWER_NOTIFICATION_EMAIL_TO=miker@mmcfetridge.net
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER=mail.mmcfetridge.net
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=465
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=miker@mmcfetridge.net
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=!Sucyetat123
-      - WATCHTOWER_NOTIFICATION_EMAIL_DELAY=2
+      - TZ=${TZ}
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - WATCHTOWER_CLEANUP=${WATCHTOWER_CLEANUP}
+      - WATCHTOWER_INCLUDE_RESTARTING=${WATCHTOWER_INCLUDE_RESTARTING}
+      - WATCHTOWER_ROLLING_RESTARTING=${WATCHTOWER_ROLLING_RESTARTING}
+      - WATCHTOWER_SCHEDULE=${WATCHTOWER_SCHEDULE}
+      - WATCHTOWER_INCLUDE_STOPPED=${WATCHTOWER_INCLUDE_STOPPED}
+      - WATCHTOWER_NOTIFICATIONS=${WATCHTOWER_NOTIFICATIONS}
+      - WATCHTOWER_NOTIFICATIONS_HOSTNAME=${WATCHTOWER_NOTIFICATIONS_HOSTNAME}
+      - WATCHTOWER_NOTIFICATION_EMAIL_FROM=${WATCHTOWER_NOTIFICATION_EMAIL_FROM}
+      - WATCHTOWER_NOTIFICATION_EMAIL_TO=${WATCHTOWER_NOTIFICATION_EMAIL_TO}
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER}
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT}
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER}
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD}
+      - WATCHTOWER_NOTIFICATION_EMAIL_DELAY=${WATCHTOWER_NOTIFICATION_EMAIL_DELAY}
     security_opt:
       - no-new-privileges:true
     volumes:
@@ -30,6 +32,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
       - external
+
 networks:
   external:
-    external: true    # Tells Compose not to create this network. 
+    external: true