Rename, refactor, hide build.imagesToLoad
imagesToLoad is not the right api for non-service images.
This commit is contained in:
parent
c3a5f8c13f
commit
c8f7f5a6d3
4 changed files with 12 additions and 11 deletions
|
@ -28,6 +28,7 @@ in
|
|||
options = {
|
||||
build.imagesToLoad = lib.mkOption {
|
||||
type = listOf unspecified;
|
||||
internal = true;
|
||||
description = "List of dockerTools image derivations.";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -5,17 +5,14 @@
|
|||
*/
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
inherit (lib) mapAttrs filterAttrs;
|
||||
|
||||
serviceInfo =
|
||||
lib.mapAttrs getInfo (
|
||||
lib.filterAttrs filterFunction config.services
|
||||
filterAttrs (_k: v: v != {})
|
||||
(mapAttrs (_serviceName: service: service.out.extendedInfo)
|
||||
config.services
|
||||
);
|
||||
|
||||
filterFunction = _serviceName: service:
|
||||
# shallow equality suffices for emptiness test
|
||||
builtins.attrNames service.build.extendedInfo != [];
|
||||
|
||||
getInfo = _serviceName: service: service.build.extendedInfo;
|
||||
|
||||
in
|
||||
{
|
||||
config = {
|
||||
|
|
|
@ -14,6 +14,6 @@ in
|
|||
};
|
||||
};
|
||||
config = {
|
||||
build.extendedInfo.defaultExec = config.service.defaultExec;
|
||||
out.extendedInfo.defaultExec = config.service.defaultExec;
|
||||
};
|
||||
}
|
|
@ -4,8 +4,11 @@ let
|
|||
inherit (lib.types) attrsOf unspecified;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule ["build" "extendedInfo"] ["out" "extendedInfo"])
|
||||
];
|
||||
options = {
|
||||
build.extendedInfo = mkOption {
|
||||
out.extendedInfo = mkOption {
|
||||
type = attrsOf unspecified;
|
||||
description = ''
|
||||
Information about a service to include in the Docker Compose file,
|
||||
|
|
Loading…
Reference in a new issue