merging NOC

NOC/compose.yml

@@ -3,6 +3,7 @@ services:
 #https://github.com/sassanix/Warracker
   warracker:
     image: ghcr.io/sassanix/warracker/main:latest
+    container_name: warracker
     ports:
       - "8005:80"
     volumes:
@@ -15,6 +16,7 @@ services:
     restart: unless-stopped
 
   warrackerdb:
+    container_name: warracker-db
     image: postgres:15-alpine
     volumes:
       - postgres_data:/var/lib/postgresql/data
@@ -26,8 +28,6 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
-
-
   freshrss:
     image: freshrss/freshrss:latest
     # # Optional build section if you want to build the image locally:
@@ -57,8 +57,56 @@ services:
       interval: 75s
       retries: 3
 
+  umami:
+    image: ghcr.io/umami-software/umami:latest
+    container_name: umami
+    ports:
+      - "3000:3000"
+    environment:
+      DATABASE_URL: postgresql://umami:umami@db:5432/umami
+      APP_SECRET: replace-me-with-a-random-string
+    depends_on:
+      db:
+        condition: service_healthy
+    init: true
+    restart: always
+    healthcheck:
+      test: ["CMD-SHELL", "curl http://localhost:3000/api/heartbeat"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+  umami-db:
+    container_name: umami-db
+    image: postgres:15-alpine
+    environment:
+      POSTGRES_DB: umami
+      POSTGRES_USER: umami
+      POSTGRES_PASSWORD: umami
+    volumes:
+      - umami-db-data:/var/lib/postgresql/data
+    restart: always
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+  wallos:
+    container_name: wallos
+    image: bellamy/wallos:latest
+    ports:
+      - "8282:80/tcp"
+    environment:
+      TZ: 'America/Chicago'
+    # Volumes store your data between container upgrades
+    volumes:
+      - './db:/var/www/html/db'
+      - './logos:/var/www/html/images/uploads/logos'
+    restart: unless-stopped
+
 volumes:
   postgres_data:
   warracker_uploads:
   RSSdata:
-  RSSextensions:
+  RSSextensions:
+  umami-db-data: