Services are ready.

modules/services/passbolt.nix

@@ -3,23 +3,26 @@
 with lib;
 
 let
+  passboltVersion = "5.9.0-1-ce-non-root";
+  databaseVersion = "12.2";
   helper = import ./lib.nix { inherit config pkgs lib; };
   cfg = config.numbus.services.passbolt;
 in
 
 helper.mkPodmanService {
-  name = "passbolt";
   description = "Passbolt, your password manager";
-  defaultPort = "4433";
+  name = "passbolt";
   pod = "passbolt";
+  defaultPort = "4433";
   scheme = "https";
   configDir = false;
   dataDir = false;
 
+# Compose file good
   composeText = ''
     services:
       passbolt-server:
-        image: docker.io/passbolt/passbolt:latest-ce-non-root
+        image: docker.io/passbolt/passbolt:${passboltVersion}
         container_name: passbolt-server
         hostname: passbolt-server
         networks:
@@ -42,7 +45,7 @@ helper.mkPodmanService {
           EMAIL_TRANSPORT_DEFAULT_USERNAME: $EMAIL_TRANSPORT_DEFAULT_USERNAME
           EMAIL_TRANSPORT_DEFAULT_PASSWORD: $EMAIL_TRANSPORT_DEFAULT_PASSWORD
           EMAIL_TRANSPORT_DEFAULT_TLS: true
-          EMAIL_DEFAULT_FROM: $EMAIL_ADDRESS
+          EMAIL_DEFAULT_FROM: passbolt-noreply@${config.numbus.services.domain}
           PASSBOLT_SSL_FORCE: true
         command:
           [
@@ -61,7 +64,7 @@ helper.mkPodmanService {
           - NET_RAW
         restart: unless-stopped
       passbolt-database:
-        image: docker.io/library/mariadb:12.2
+        image: docker.io/library/mariadb:${databaseVersion}
         container_name: passbolt-database
         hostname: passbolt-database
         networks:
@@ -80,8 +83,11 @@ helper.mkPodmanService {
         restart: unless-stopped
     volumes:
       passbolt-database:
+        name: passbolt-database
       passbolt-gpg:
+        name: passbolt-gpg
       passbolt-jwt:
+        name: passbolt-jwt
     networks:
       passbolt:
         name: passbolt