Use the right string type

This commit is contained in:
Robert Hensing 2019-03-04 00:12:01 +01:00
parent ccaac02a87
commit dc762a79bf

View file

@ -8,7 +8,7 @@
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (types) listOf nullOr attrsOf string either int bool; inherit (types) listOf nullOr attrsOf str either int bool;
dockerComposeRef = fragment: dockerComposeRef = fragment:
''See <link xlink:href="https://docs.docker.com/compose/compose-file/#${fragment}">Docker Compose#${fragment}</link>''; ''See <link xlink:href="https://docs.docker.com/compose/compose-file/#${fragment}">Docker Compose#${fragment}</link>'';
@ -26,7 +26,7 @@ in
description = ""; description = "";
}; };
service.build.context = mkOption { service.build.context = mkOption {
type = nullOr string; type = nullOr str;
default = null; default = null;
description = '' description = ''
Locates a Dockerfile to use for creating an image to use in this service. Locates a Dockerfile to use for creating an image to use in this service.
@ -35,17 +35,17 @@ in
''; '';
}; };
service.hostname = mkOption { service.hostname = mkOption {
type = nullOr string; type = nullOr str;
default = null; default = null;
description = dockerComposeKitchenSink; description = dockerComposeKitchenSink;
}; };
service.environment = mkOption { service.environment = mkOption {
type = attrsOf (either string int); type = attrsOf (either str int);
default = {}; default = {};
description = dockerComposeRef "environment"; description = dockerComposeRef "environment";
}; };
service.image = mkOption { service.image = mkOption {
type = string; type = str;
description = dockerComposeRef "image"; description = dockerComposeRef "image";
}; };
service.command = mkOption { service.command = mkOption {
@ -54,27 +54,27 @@ in
description = dockerComposeRef "command"; description = dockerComposeRef "command";
}; };
service.depends_on = mkOption { service.depends_on = mkOption {
type = listOf string; type = listOf str;
default = []; default = [];
description = dockerComposeRef "depends_on"; description = dockerComposeRef "depends_on";
}; };
service.links = mkOption { service.links = mkOption {
type = listOf string; type = listOf str;
default = []; default = [];
description = dockerComposeRef "links"; description = dockerComposeRef "links";
}; };
service.external_links = mkOption { service.external_links = mkOption {
type = listOf string; type = listOf str;
default = []; default = [];
description = dockerComposeRef "external_links"; description = dockerComposeRef "external_links";
}; };
service.extra_hosts = mkOption { service.extra_hosts = mkOption {
type = listOf string; type = listOf str;
default = []; default = [];
description = dockerComposeRef "extra_hosts"; description = dockerComposeRef "extra_hosts";
}; };
service.working_dir = mkOption { service.working_dir = mkOption {
type = nullOr string; type = nullOr str;
default = null; default = null;
description = dockerComposeKitchenSink; description = dockerComposeKitchenSink;
}; };
@ -84,12 +84,12 @@ in
description = dockerComposeKitchenSink; description = dockerComposeKitchenSink;
}; };
service.entrypoint = mkOption { service.entrypoint = mkOption {
type = nullOr string; type = nullOr str;
default = null; default = null;
description = dockerComposeRef "entrypoint"; description = dockerComposeRef "entrypoint";
}; };
service.restart = mkOption { service.restart = mkOption {
type = nullOr string; type = nullOr str;
default = null; default = null;
description = dockerComposeRef "restart"; description = dockerComposeRef "restart";
}; };
@ -103,7 +103,7 @@ in
''; '';
}; };
service.expose = mkOption { service.expose = mkOption {
type = listOf string; type = listOf str;
default = []; default = [];
description = dockerComposeRef "expose"; description = dockerComposeRef "expose";
}; };