diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-07 23:51:27 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-08 00:25:04 +0000 |
| commit | 096ca241d9505c265fe46cacec7b316eecb401ad (patch) | |
| tree | 1c4f5daadf7a0f2544ef9b1d219ddcca6867df0d /nixos/modules/virtualisation/docker-containers.nix | |
| parent | 1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (diff) | |
| parent | 5f6df74f66246a2eb198b0bc3fe1f7d2dff57062 (diff) | |
| download | nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.gz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.bz2 nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.lz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.xz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.zst nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'nixos/modules/virtualisation/docker-containers.nix')
| -rw-r--r-- | nixos/modules/virtualisation/docker-containers.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix index 59b0943f591..760cb9122a2 100644 --- a/nixos/modules/virtualisation/docker-containers.nix +++ b/nixos/modules/virtualisation/docker-containers.nix @@ -186,7 +186,7 @@ let ++ map escapeShellArg container.cmd ); ExecStartPre = "-${pkgs.docker}/bin/docker rm -f %n"; - ExecStop = "${pkgs.docker}/bin/docker stop %n"; + ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || ${pkgs.docker}/bin/docker stop %n"''; ExecStopPost = "-${pkgs.docker}/bin/docker rm -f %n"; ### There is no generalized way of supporting `reload` for docker |