diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix index 3a2eb97d1bf1..216ba2c733fc 100644 --- a/nixos/modules/virtualisation/docker-containers.nix +++ b/nixos/modules/virtualisation/docker-containers.nix @@ -39,7 +39,7 @@ let entrypoint = mkOption { type = with types; nullOr str; - description = "Overwrite the default entrypoint of the image."; + description = "Override the default entrypoint of the image."; default = null; example = "/bin/my-app"; }; @@ -145,7 +145,7 @@ let Note that this is a list of "src:dst" strings to allow for src to refer to - /nix/store paths, which would difficult with an + /nix/store paths, which would be difficult with an attribute set. There are also a variety of mount options available as a third field; please refer to the @@ -220,10 +220,9 @@ let ++ map escapeShellArg container.cmd ); - ExecStartPre = ["-${pkgs.docker}/bin/docker rm -f ${name}" - "-${pkgs.docker}/bin/docker image prune -f"] ++ - (optional (container.imageFile != null) - ["${pkgs.docker}/bin/docker load -i ${container.imageFile}"]); + ExecStartPre = + ["-${pkgs.docker}/bin/docker rm -f ${name}"] ++ + (optional (container.imageFile != null) "${pkgs.docker}/bin/docker load -i ${container.imageFile}"); ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || ${pkgs.docker}/bin/docker stop ${name}"''; ExecStopPost = "-${pkgs.docker}/bin/docker rm -f ${name}";