From 8de71e5114b6cc0bcdce00def57c1cfa23ff6158 Mon Sep 17 00:00:00 2001
From: BenjiG70 <markus.tabler@tutanota.com>
Date: Sun, 28 Jun 2026 11:56:35 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20updated=20running=20passbolt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 passbolt/docker-compose.yml | 51 +++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/passbolt/docker-compose.yml b/passbolt/docker-compose.yml
index 918ca65..fa3abb1 100644
--- a/passbolt/docker-compose.yml
+++ b/passbolt/docker-compose.yml
@@ -38,19 +38,31 @@ services:
       passbolt-db:
         condition: service_healthy
     environment:
-      - APP_FULL_BASE_URL=https://${SUBDOMAIN}.${DOMAIN} 
-      - DB_HOST=passbolt-db
-      - DB_USER=${DB_USER}
-      - DB_PASSWORD=${DB_PASSWORD}
-      - DB_DATABASE=${DB_DATABASE}
-      - EMAIL_DEFAULT_TRANSPORT=${EMAIL_TRANSPORT}
-      - PASSBOLT_SSL_FORCE=true
-      - PASSBOLT_SECURITY_SSL_PROXY=true
-      - PASSBOLT_EMAIL_VALIDATE_MX=false
-      - PASSBOLT_FORCE_BASE_URL=https://${SUBDOMAIN}.${DOMAIN}
+      - APP_FULL_BASE_URL=https://${SUBDOMAIN}.${DOMAIN}
+      - DATASOURCES_DEFAULT_HOST=passbolt-db
+      - DATASOURCES_DEFAULT_PORT=3306
+      - DATASOURCES_DEFAULT_DATABASE=${DB_DATABASE}
+      - DATASOURCES_DEFAULT_USERNAME=${DB_USER}
+      - DATASOURCES_DEFAULT_PASSWORD=${DB_PASSWORD}
+
+      - PASSBOLT_SSL_FORCE=false
+      - PASSBOLT_SECURITY_SSL_PROXY=HTTP_X_FORWARDED_PROTO
+      # GPG settings
+      - PASSBOLT_GPG_SERVER_KEY_FINGERPRINT=${GPG_FINGERPRINT}
+
+      - PASSBOLT_KEY_EMAIL=markus.tabler@tutanota.com
+
+      #- EMAIL_DEFAULT_TRANSPORT=${EMAIL_TRANSPORT}
+      #- EMAIL_TRANSPORT_DEFAULT_HOST=smtp.example.com
+      #- EMAIL_TRANSPORT_DEFAULT_PORT=587
+      #- EMAIL_TRANSPORT_DEFAULT_USERNAME=user
+      #- EMAIL_TRANSPORT_DEFAULT_PASSWORD=password
+      #- EMAIL_TRANSPORT_DEFAULT_TLS=true
+    extra_hosts:
+      - "passwords.bybenji.de:172.17.0.1"
     volumes:
       - type: bind
-        source: ${PGP_PATH}
+        source: ${GPG_PATH}
         target: /etc/passbolt/gpg
         bind:
           create_host_path: true
@@ -59,6 +71,13 @@ services:
         target: /etc/passbolt/jwt
         bind:
           create_host_path: true
+      #- type: bind
+      #  source: ${GPG_DOT_PATH}
+      #  target: /var/lib/passbolt/.gnupg
+      #  bind:
+      #    create_host_path: true
+      #    selinux: z
+      - passbolt_gnupg:/var/lib/passbolt/.gnupg
     logging:
       driver: "json-file"
       options:
@@ -75,11 +94,15 @@ services:
       - "traefik.http.routers.${ROUTER_NAME}.tls.certresolver=${CERTIFICATE_RESOLVER}"
       - "traefik.http.services.${ROUTER_NAME}.loadbalancer.server.port=80"
       - "traefik.docker.network=${TRAEFIK_NETWORK}"
-      - "traefik.http.routers.${ROUTER_NAME}.middlewares=passbolt-headers@docker"
-      - "traefik.http.middlewares.passbolt-headers.headers.customrequestheaders.X-Forwarded-Proto=https"
 
+      # Define the middleware that adds the header
+      - "traefik.http.middlewares.passbolt-proxy.headers.customrequestheaders.X-Forwarded-Proto=https"
+      # Apply that middleware to your router
+      - "traefik.http.routers.${ROUTER_NAME}.middlewares=passbolt-proxy@docker"
 networks:
   traefik:
     external: true
   internal_net:
-    driver: bridge
\ No newline at end of file
+    driver: bridge
+volumes:
+  passbolt_gnupg:
\ No newline at end of file