modified: gitea/docker-compose.yml

modified:   nextcloud/docker-compose.yml
	modified:   passbolt/docker-compose.yml
	modified:   searxng/docker-compose.yml
	modified:   traefik/docker-compose.yml

passbolt/docker-compose.yml

@@ -1,7 +1,6 @@
-#version: "3.9"
 services:
   db:
-    image: mariadb:10.11
+    image: mariadb:12
     restart: unless-stopped
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: "true"
@@ -11,12 +10,18 @@ services:
     volumes:
       - ./data/database:/var/lib/mysql
     networks:
-      - traefik_default
+      - internal
+    healthcheck:
+      test: ["CMD-SHELL", "mariadb-admin ping -h 127.0.0.1 -u\"$$MARIADB_USER\" -p\"$$MARIADB_PASSWORD\" --silent"]
+      interval: 10s
+      timeout: 5s
+      retries: 12
+      start_period: 60s
+
 
   webapp:
     image: passbolt/passbolt:latest-ce
     #Alternatively you can use rootless:
-    #image: passbolt/passbolt:latest-ce-non-root
     restart: unless-stopped
     depends_on:
       - db
@@ -39,7 +44,8 @@ services:
         "/docker-entrypoint.sh",
       ]
     networks:
-      - traefik_default
+      - traefik_reverse_proxy
+      - internal
     labels:
       - "traefik.http.routers.passbolt.rule=Host(`passbolt.lan.ddnsgeek.com`)"
       - "traefik.enable=true"
@@ -47,18 +53,21 @@ services:
       - "traefik.http.routers.passbolt.tls.certresolver=myresolver"
       - "io.portainer.accesscontrol.public"
       - "traefik.http.routers.passbolt.middlewares=error-pages-middleware"
+      - "traefik.docker.network=traefik_reverse_proxy"
+
+#    healthcheck:
+#      test: >
+#        CMD-SHELL
+#        su -s /bin/sh -c "/usr/share/php/passbolt/bin/cake passbolt healthcheck" www-data
+#        | grep -q "No error found"
+#      interval: 30s
+#      timeout: 10s
+#      retries: 6
+#      start_period: 120s
 
-#    ports:
-#      - 8082:80
-#      - 4432:443
-    #Alternatively for non-root images:
-    # - 80:8080
-    # - 443:4433
 
-#volumes:
-#  database_volume:
-#  gpg_volume:
-#  jwt_volume:
 networks:
-  traefik_default:
+  traefik_reverse_proxy:
     external: true
+  internal:
+    driver: bridge