diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 753e04d..c6ad06b 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -52,7 +52,7 @@ ]; environment.DOCKGE_STACKS_DIR = "/opt/stacks"; }; - extraConfig.volumes = { + volumes = { dockge-data = { driver = "local"; driver_opts = { diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 33d003b..cbc0625 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -33,7 +33,7 @@ ]; environment.DOCKGE_STACKS_DIR = "/opt/stacks"; }; - extraConfig.volumes = { + volumes = { dockge-data = { driver = "local"; driver_opts = { @@ -69,7 +69,7 @@ networks = [ ]; }; }; - extraConfig.volumes = { + volumes = { scrypted-nvr = { driver = "local"; driver_opts = { diff --git a/modules/nixos/common/containers/container-services/compose.nix b/modules/nixos/common/containers/container-services/compose.nix index 2f96ceb..74cb395 100644 --- a/modules/nixos/common/containers/container-services/compose.nix +++ b/modules/nixos/common/containers/container-services/compose.nix @@ -48,8 +48,8 @@ rec { grpCfg.services; networks = networks; } - // lib.optionalAttrs (grpCfg.volumes != [ ]) { - volumes = lib.genAttrs grpCfg.volumes (_: { }); + // lib.optionalAttrs (grpCfg.volumes != { }) { + volumes = grpCfg.volumes; } // grpCfg.extraConfig; diff --git a/modules/nixos/common/containers/container-services/options.nix b/modules/nixos/common/containers/container-services/options.nix index 23d6b10..9630eb1 100644 --- a/modules/nixos/common/containers/container-services/options.nix +++ b/modules/nixos/common/containers/container-services/options.nix @@ -126,9 +126,25 @@ }; volumes = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = "Named volumes declared at the top level of the compose document."; + type = lib.types.attrsOf lib.types.anything; + default = { }; + example = { + my-vol = { + driver = "local"; + driver_opts = { + type = "nfs"; + o = "addr=host,rw,nfsvers=4.0"; + device = ":/export/path"; + }; + }; + bare-vol = { }; + }; + description = '' + Named volumes declared at the top level of the compose document + (maps to the compose volumes: block). Key = volume name, value = + volume definition (driver/driver_opts/etc.). Use an empty attrset + for a default-driver named volume. + ''; }; networks = lib.mkOption {