diff options
| author | Robin Gloster <mail@glob.in> | 2019-05-18 09:36:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 09:36:24 +0000 |
| commit | 6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6 (patch) | |
| tree | 6590fc8630f685b81d4f1a5487a54b31785f3c8b /nixos/modules/virtualisation/docker-containers.nix | |
| parent | d40443ba6de52faf08bb33198c6e501f46b85a89 (diff) | |
| parent | 786f02f7a45621b9f628f63649ff92546aff83b7 (diff) | |
Merge pull request #60406 from JohnAZoidberg/remove-isnull
treewide: Remove usage of isNull
Diffstat (limited to 'nixos/modules/virtualisation/docker-containers.nix')
| -rw-r--r-- | nixos/modules/virtualisation/docker-containers.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix index c1f0ba303e32..3e882a1383ff 100644 --- a/nixos/modules/virtualisation/docker-containers.nix +++ b/nixos/modules/virtualisation/docker-containers.nix @@ -174,13 +174,13 @@ let "--rm" "--name=%n" "--log-driver=${container.log-driver}" - ] ++ optional (! isNull container.entrypoint) + ] ++ optional (container.entrypoint != null) "--entrypoint=${escapeShellArg container.entrypoint}" ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) ++ map (p: "-p ${escapeShellArg p}") container.ports - ++ optional (! isNull container.user) "-u ${escapeShellArg container.user}" + ++ optional (container.user != null) "-u ${escapeShellArg container.user}" ++ map (v: "-v ${escapeShellArg v}") container.volumes - ++ optional (! isNull container.workdir) "-w ${escapeShellArg container.workdir}" + ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" ++ map escapeShellArg container.extraDockerOptions ++ [container.image] ++ map escapeShellArg container.cmd |