public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docker: use upstream service file from package

Browse Source
This commit is contained in:
Jörg Thalheim 2016-12-24 01:44:10 +01:00
parent f4e58c2eb2
commit 585c642bf8
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
1 changed files with 20 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
nixos/modules/virtualisation/docker.nix
View File

@ -99,55 +99,34 @@ in
###### implementation ###### implementation
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [{
{ environment.systemPackages = [ pkgs.docker ]; environment.systemPackages = [ pkgs.docker ];
users.extraGroups.docker.gid = config.ids.gids.docker; users.extraGroups.docker.gid = config.ids.gids.docker;
# this unit follows the one provided by upstream see: https://github.com/docker/docker/blob/master/contrib/init/systemd/docker.service systemd.packages = [ pkgs.docker ];
# comments below reflect experience from upstream.
systemd.services.docker = { systemd.services.docker = {
description = "Docker Application Container Engine";
wantedBy = optional cfg.enableOnBoot "multi-user.target"; wantedBy = optional cfg.enableOnBoot "multi-user.target";
after = [ "network.target" "docker.socket" ];
requires = ["docker.socket"];
serviceConfig = { serviceConfig = {
# the default is not to use systemd for cgroups because the delegate issues still ExecStart = [
# exists and systemd currently does not support the cgroup feature set required ""
# for containers run by docker ''
ExecStart = ''${pkgs.docker}/bin/dockerd \ ${pkgs.docker}/bin/dockerd \
--group=docker \ --group=docker \
--host=fd:// \ --host=fd:// \
--log-driver=${cfg.logDriver} \ --log-driver=${cfg.logDriver} \
${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
${optionalString cfg.liveRestore "--live-restore" } \ ${optionalString cfg.liveRestore "--live-restore" } \
${cfg.extraOptions} ${cfg.extraOptions}
''; ''];
Type="notify"; ExecReload=[
ExecReload="${pkgs.procps}/bin/kill -s HUP $MAINPID"; ""
LimitNOFILE = 1048576; "${pkgs.procps}/bin/kill -s HUP $MAINPID"
# Having non-zero Limit*s causes performance problems due to accounting overhead ];
# in the kernel. We recommend using cgroups to do container-local accounting.
LimitNPROC="infinity";
LimitCORE="infinity";
TasksMax="infinity";
TimeoutStartSec=0;
# set delegate yes so that systemd does not reset the cgroups of docker containers
Delegate="yes";
# kill only the docker process, not all processes in the cgroup
KillMode="process";
} // proxy_env; } // proxy_env;
path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
}; };
systemd.sockets.docker = { systemd.sockets.docker.socketConfig.ListenStream = cfg.listenOptions;
description = "Docker Socket for the API";
wantedBy = [ "sockets.target" ];
socketConfig = {
ListenStream = cfg.listenOptions;
SocketMode = "0660";
SocketUser = "root";
SocketGroup = "docker";
};
};
} }
]); ]);