build

__swarm/registry/registry-swarm.yml

@@ -1,5 +1,5 @@
 services:
-  registry:
+  app:
     environment:
       REGISTRY_STORAGE_DELETE_ENABLED: 'true'
       REGISTRY_AUTH: htpasswd
@@ -10,6 +10,12 @@ services:
       driver: loki
       options:
         loki-url: http://192.168.77.101:3100/loki/api/v1/push
+        loki-relabel-config: |
+          - action: labelmap
+            regex: swarm_stack
+            replacement: namespace
+          - action: labelmap
+            regex: swarm_(service)
     ports:
     - target: 5000
       published: 5000
@@ -17,15 +23,18 @@ services:
       mode: ingress
     volumes:
     - auth:/auth
-    - data:/var/lib/registry
+    - /share/docker_registry/data:/var/lib/registry
+    - config:/etc/docker/registry/
+    
     deploy:
       labels:
         wud.watch: 'false'
         wud.watch.digest: 'false'
+        service_name: 'registry'
       replicas: 1
-      placement:
+      restart_policy:
-        constraints:
+        condition: any
-        - node.role == manager
+
 volumes:
   auth:
-  data:
+  config:

__swarm/regsync/regsync-swarm.yml

@@ -2,7 +2,7 @@ volumes:
   config:
     driver: local
 services:
-  regsync:
+  app:
     command: -c /home/appuser/regsync.yml server
     env_file:
     - stack.env

__swarm/uptime-kuma/uptime-kuma-swarm.yml

@@ -15,8 +15,7 @@ services:
         wud.watch: 'true'
         wud.watch.digest: 'true'
       replicas: 1
-      placement:
+      restart_policy:
-        constraints:
+        condition: any
-        - node.role == manager
 volumes:
   data:

__swarm/wud/stack.env

@@ -16,7 +16,7 @@ WUD_AUTH_OIDC_AUTHENTIK_TIMEOUT=2000
 
 # BASIC
 WUD_AUTH_BASIC_JAYDEE_USER=homepage
-WUD_AUTH_BASIC_JAYDEE_HASH=$$apr1$$pGMz1QxU$$y6XuTscvGcYgas15JWlfg/
+WUD_AUTH_BASIC_JAYDEE_HASH=$apr1$OZNN/65l$cQp3tMfyQdftPIgje.uDZ1
 # GOTIFY
 WUD_TRIGGER_GOTIFY_EXTERNAL_PRIORITY=0
 WUD_TRIGGER_GOTIFY_EXTERNAL_TOKEN="AFxvpm1JpPSsmkf"
@@ -47,14 +47,14 @@ WUD_LOG_LEVEL=debug
 # text json
 WUD_LOG_FORMAT=text
 
-WUD_WATCHER_EXTDOCKER_HOST=193.168.144.164
+# WUD_WATCHER_EXTDOCKER_HOST=193.168.144.164
-WUD_WATCHER_EXTDOCKER_PORT=2376
+# WUD_WATCHER_EXTDOCKER_PORT=2376
-WUD_WATCHER_EXTDOCKER_CERTFILE=/certs/ext/cert.pem
+# WUD_WATCHER_EXTDOCKER_CERTFILE=/certs/ext/cert.pem
-WUD_WATCHER_EXTDOCKER_CAFILE=/certs/ext/ca.pem
+# WUD_WATCHER_EXTDOCKER_CAFILE=/certs/ext/ca.pem
-WUD_WATCHER_EXTDOCKER_KEYFILE=/certs/ext/key.pem
+# WUD_WATCHER_EXTDOCKER_KEYFILE=/certs/ext/key.pem
-WUD_WATCHER_EXTDOCKER_CRON=0 * * * *
+# WUD_WATCHER_EXTDOCKER_CRON=0 * * * *
-WUD_WATCHER_EXTDOCKER_WATCHALL=true
+# WUD_WATCHER_EXTDOCKER_WATCHALL=true
-WUD_WATCHER_EXTDOCKER_WATCHBYDEFAULT=true
+# WUD_WATCHER_EXTDOCKER_WATCHBYDEFAULT=true
 
 WUD_WATCHER_MSERVER_HOST=192.168.77.101
 WUD_WATCHER_MSERVER_PORT=2376
@@ -65,14 +65,14 @@ WUD_WATCHER_MSERVER_CRON=0 * * * *
 WUD_WATCHER_MSERVER_WATCHALL=true
 WUD_WATCHER_MSERVER_WATCHBYDEFAULT=false
 
-WUD_WATCHER_RPI5_HOST=192.168.77.238
+# WUD_WATCHER_RPI5_HOST=192.168.77.238
-WUD_WATCHER_RPI5_PORT=2376
+# WUD_WATCHER_RPI5_PORT=2376
-WUD_WATCHER_RPI5_CERTFILE=/certs/rpi5/cert.pem
+# WUD_WATCHER_RPI5_CERTFILE=/certs/rpi5/cert.pem
-WUD_WATCHER_RPI5_CAFILE=/certs/rpi5/ca.pem
+# WUD_WATCHER_RPI5_CAFILE=/certs/rpi5/ca.pem
-WUD_WATCHER_RPI5_KEYFILE=/certs/rpi5/key.pem
+# WUD_WATCHER_RPI5_KEYFILE=/certs/rpi5/key.pem
-WUD_WATCHER_RPI5_CRON=0 * * * *
+# WUD_WATCHER_RPI5_CRON=0 * * * *
-WUD_WATCHER_RPI5_WATCHALL=true
+# WUD_WATCHER_RPI5_WATCHALL=true
-WUD_WATCHER_RPI5_WATCHBYDEFAULT=true
+# WUD_WATCHER_RPI5_WATCHBYDEFAULT=true
 
 WUD_WATCHER_NAS_HOST=192.168.77.106
 WUD_WATCHER_NAS_PORT=2376
@@ -83,13 +83,13 @@ WUD_WATCHER_NAS_CRON=0 * * * *
 WUD_WATCHER_NAS_WATCHALL=true
 WUD_WATCHER_NAS_WATCHBYDEFAULT=true
 
-WUD_WATCHER_RACK_HOST=192.168.77.55
+# WUD_WATCHER_RACK_HOST=192.168.77.55
-WUD_WATCHER_RACK_PORT=2376
+# WUD_WATCHER_RACK_PORT=2376
-WUD_WATCHER_RACK_CERTFILE=/certs/rack/cert.pem
+# WUD_WATCHER_RACK_CERTFILE=/certs/rack/cert.pem
-WUD_WATCHER_RACK_CAFILE=/certs/rack/ca.pem
+# WUD_WATCHER_RACK_CAFILE=/certs/rack/ca.pem
-WUD_WATCHER_RACK_KEYFILE=/certs/rack/key.pem
+# WUD_WATCHER_RACK_KEYFILE=/certs/rack/key.pem
-WUD_WATCHER_RACK_CRON=0 * * * *
+# WUD_WATCHER_RACK_CRON=0 * * * *
-WUD_WATCHER_RACK_WATCHALL=true
+# WUD_WATCHER_RACK_WATCHALL=true
-WUD_WATCHER_RACK_WATCHBYDEFAULT=true
+# WUD_WATCHER_RACK_WATCHBYDEFAULT=true
 
 WUD_SERVER_CORS_ENABLED=true

__swarm/wud/wud-swarm.yml

@@ -1,5 +1,5 @@
 services:
-  whatsupdocker:
+  app:
     env_file:
     - stack.env
     image: ${DOCKER_REGISTRY:-}getwud/wud
@@ -19,7 +19,7 @@ services:
     deploy:
       labels:
         com.centurylinklabs.watchtower.enable: 'true'
-        homepage.container: wud
+        homepage.container: wud_app
         homepage.description: Docker container management
         homepage.group: Infrastructure
         homepage.href: https://wud.sectorq.eu
@@ -34,9 +34,8 @@ services:
         wud.watch: 'true'
         wud.watch.digest: 'true'
       replicas: 1
-      placement:
+      restart_policy:
-        constraints:
+        condition: any
-        - node.role == manager
 volumes:
   data:
   certs:

__swarm/zabbix-server/zabbix-server-swarm.yml

@@ -1,11 +1,10 @@
 networks:
   zabbix:
     driver: overlay
-    attachable: true
     ipam:
       config:
-        - subnet: 192.168.82.0/24
+      - subnet: 192.168.89.0/28
-
+      driver: default
 services:
   db-server:
     env_file:
@@ -13,26 +12,26 @@ services:
     image: ${DOCKER_REGISTRY:-}postgres:16-alpine
     networks:
       zabbix:
+        ipv4_address: 192.168.89.4
     ports:
     - target: 5432
       published: 5432
       protocol: tcp
       mode: ingress
     volumes:
-    - postgres-data:/var/lib/postgresql/data
+    - db:/var/lib/postgresql/data
     deploy:
       labels:
         com.centurylinklabs.watchtower.enable: 'true'
       replicas: 1
-      placement:
+
-        constraints:
-        - node.role == manager
   zabbix-frontend:
     env_file:
     - stack.env
     image: ${DOCKER_REGISTRY:-}zabbix/zabbix-web-nginx-pgsql:alpine-latest
     networks:
       zabbix:
+        ipv4_address: 192.168.89.3
     ports:
     - target: 8080
       published: 8051
@@ -50,9 +49,7 @@ services:
         wud.watch: 'true'
         wud.watch.digest: 'true'
       replicas: 1
-      placement:
+
-        constraints:
-        - node.role == manager
   zabbix-server:
     env_file:
     - stack.env
@@ -61,6 +58,7 @@ services:
     - alertscripts:/usr/lib/zabbix/alertscripts
     networks:
       zabbix:
+        ipv4_address: 192.168.89.2
     ports:
     - target: 10051
       published: 10051
@@ -83,9 +81,7 @@ services:
         wud.watch: 'true'
         wud.watch.digest: 'true'
       replicas: 1
-      placement:
+
-        constraints:
-        - node.role == manager
   webdriver:
     ports:
     - target: 4444
@@ -96,15 +92,14 @@ services:
       published: 7900
       protocol: tcp
       mode: ingress
+    shm_size: 2g
     image: ${DOCKER_REGISTRY:-}docker.io/selenium/standalone-chrome:latest
     deploy:
       labels:
         wud.watch: 'true'
         wud.watch.digest: 'true'
       replicas: 1
-      placement:
+
-        constraints:
-        - node.role == manager
   postinstall:
     image: debian:12-slim
     environment:
@@ -120,11 +115,9 @@ services:
     - /scripts/install-curl.sh
     deploy:
       replicas: 1
-      placement:
+
-        constraints:
-        - node.role == manager
 volumes:
-  scripts:
+  db:
   certs:
   alertscripts:
-  postgres-data:
+  scripts: