Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f4375dd320cd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a461f3fa9c44
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 1, 2020

  1. Consider the exit status of docker run in ExecStop (#76444) 

    We don't need to stop the container if it already exited sucessfully
    @Atemu @benley
    Atemu authored and benley committed Jan 1, 2020
    Copy the full SHA
    a461f3f View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/virtualisation/docker-containers.nix
2 changes: 1 addition & 1 deletion nixos/modules/virtualisation/docker-containers.nix
View file
Original file line number Diff line number Diff line change
@@ -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