update

NginxProxyManager/docker-compose.yml

@@ -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
@@ -56,4 +58,4 @@ networks:
   internal:
     external: true
   external:
-    external: true
+    external: true