update

2026-07-22 20:23:34 -04:00
parent 4c4ddd20df
commit 15968c489b
4 changed files with 59 additions and 41 deletions
@@ -0,0 +1,13 @@
+# ============================================================
+# SYSTEM SETTINGS
+# ============================================================
+TZ=America/New_York
+DATA_PATH=/opt/Docker-Deployments/NginxProxyManager/data
+
+# ============================================================
+# DATABASE CREDENTIALS
+# ============================================================
+MYSQL_ROOT_PASSWORD=rhDGjilZm6XEMJ
+MYSQL_DATABASE=npm
+MYSQL_USER=npm
+MYSQL_PASSWORD=rhDGjilZm6XEMJ
@@ -1,52 +1,54 @@
-#
+# Nginx Proxy Manager & MariaDB Stack
 services:
  db:
-    image: 'jc21/mariadb-aria:latest'
+    image: jc21/mariadb-aria:latest
    container_name: npm-db
    restart: unless-stopped
    environment:
-      - MYSQL_ROOT_PASSWORD=rhDGjilZm6XEMJ
-      - MYSQL_DATABASE=npm
-      - MYSQL_USER=npm
-      - MYSQL_PASSWORD=rhDGjilZm6XEMJ
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
      - MARIADB_AUTO_UPGRADE=1
+      - TZ=${TZ}
    volumes:
-      - /opt/Docker-Deployments/NginxProxyManager/data/mysql:/var/lib/mysql
+      - ${DATA_PATH}/mysql:/var/lib/mysql
    networks:
      - internal
    healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u$MYSQL_USER", "-p$MYSQL_PASSWORD"]
+      test: ["CMD-SHELL", "mysqladmin ping -h localhost -u $MYSQL_USER -p$MYSQL_PASSWORD || exit 1"]
      interval: 20s
      timeout: 5s
      retries: 5
      start_period: 30s

  nginx-proxy-manager:
-    image: 'jc21/nginx-proxy-manager:latest'
+    image: jc21/nginx-proxy-manager:latest
    container_name: nginx-proxy-manager
    restart: unless-stopped
    environment:
-      - TZ=America/New_York
+      - TZ=${TZ}
      - DB_MYSQL_HOST=db
      - DB_MYSQL_PORT=3306
-      - DB_MYSQL_USER=npm
-      - DB_MYSQL_PASSWORD=rhDGjilZm6XEMJ
-      - DB_MYSQL_NAME=npm
+      - DB_MYSQL_USER=${MYSQL_USER}
+      - DB_MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - DB_MYSQL_NAME=${MYSQL_DATABASE}
    ports:
      - '80:80'
      - '81:81'
      - '443:443'
    volumes:
-      - /opt/Docker-Deployments/NginxProxyManager/data/npm:/data
-      - /opt/Docker-Deployments/NginxProxyManager/data/letsencrypt:/etc/letsencrypt
-      - /opt/Docker-Deployments/NginxProxyManager/logs:/data/logs
+      - ${DATA_PATH}/npm:/data
+      - ${DATA_PATH}/letsencrypt:/etc/letsencrypt
    depends_on:
-      - db
+      db:
+        condition: service_healthy
+        restart: true
    networks:
      - internal
      - external
    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:81/api/status"]
+      test: ["CMD", "curl", "-f", "http://localhost:81/"]
      interval: 20s
      timeout: 5s
      retries: 5
@@ -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-02
 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
@@ -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-02  # 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