Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: c23032a8b11d0585c1f1aece1d2b0abd82148e82
https://github.com/NixOS/nixpkgs/commit/c23032a8b11d0585c1f1aece1d2b0abd82148e82
Author: Jörg Thalheim <[email protected]>
Date: 2016-12-23 (Fri, 23 Dec 2016)
Changed paths:
M nixos/modules/services/web-servers/lighttpd/inginious.nix
M nixos/modules/virtualisation/docker.nix
M nixos/tests/docker-registry.nix
Log Message:
-----------
docker: update service units from upstream
All the new options in detail:
Enable docker in multi-user.target make container created with restart=always
to start. We still want socket activation as it decouples dependencies between
the existing of /var/run/docker.sock and the docker daemon. This means that
services can rely on the availability of this socket. Fixes #11478 #21303
wantedBy = ["multi-user.target"];
This allows us to remove the postStart hack, as docker reports on its own when
it is ready.
Type=notify
The following will set unset some limits because overhead in kernel's ressource
accounting was observed. Note that these limit only apply to containerd.
Containers will have their own limit set.
LimitNPROC=infinity
LimitCORE=infinity
TasksMax=infinity
Upgrades may require schema migrations. This can delay the startup of dockerd.
TimeoutStartSec=0
Allows docker to create its own cgroup subhierarchy to apply ressource limits on
containers.
Delegate=true
When dockerd is killed, container should be not affected to allow
`live restore` to work.
KillMode=process
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
