updated files

Docker-Compose/Nginx Proxy Manager/docker-compose.yml

@@ -1,33 +1,31 @@
----
+# Nginx Proxy Manager & MariaDB Stack
 services:
   db:
-    image: 'jc21/mariadb-aria:latest'
+    image: jc21/mariadb-aria:latest
     container_name: npm-db
     restart: unless-stopped
-    env_file: .env
     environment:
       - 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:
-      - ./data/mysql:/var/lib/mysql
+      - ${DATA_PATH}/mysql:/var/lib/mysql
     networks:
-      - proxy
-      - proxydb
+      - internal
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u${MYSQL_USER}", "-p${MYSQL_PASSWORD}"]
+      test: ["CMD-SHELL", "mariadb-admin ping -h 127.0.0.1 -u root -p$$MYSQL_ROOT_PASSWORD || exit 1"]
       interval: 20s
       timeout: 5s
       retries: 5
       start_period: 30s
 
-  app:
-    image: 'jc21/nginx-proxy-manager:latest'
+  nginx-proxy-manager:
+    image: jc21/nginx-proxy-manager:latest
     container_name: nginx-proxy-manager
     restart: unless-stopped
-    env_file: .env
     environment:
       - TZ=${TZ}
       - DB_MYSQL_HOST=db
@@ -40,22 +38,24 @@ services:
       - '81:81'
       - '443:443'
     volumes:
-      - ./data/npm:/data
-      - ./data/letsencrypt:/etc/letsencrypt
+      - ${DATA_PATH}/npm:/data
+      - ${DATA_PATH}/letsencrypt:/etc/letsencrypt
     depends_on:
-      - db
+      db:
+        condition: service_healthy
+        restart: true
     networks:
-      - proxy
-      - proxydb
+      - 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
       start_period: 40s
 
 networks:
-  proxy:
+  internal:
+    external: true
+  external:
     external: true
-  proxydb:
-    external: true