mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Code Issues Wiki Activity

Merge pull request #4870 from bosu/docker-proxy

Browse source 
docker: propagate nix.proxy into daemon environment
This commit is contained in:
Jaka Hudoklin 2014-11-08 13:06:56 +01:00
parent ba8e8ec8cf 0d89afdedd
commit 53667c7b1a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/virtualisation/docker.nix
View file

@ -7,6 +7,8 @@ with lib;
let
cfg = config.virtualisation.docker;
pro = config.nix.proxy;
proxy_env = optionalAttrs (pro != "") { Environment = "\"http_proxy=${pro}\""; };
in
@ -73,7 +75,7 @@ in
# goes in config bundled with docker itself
LimitNOFILE = 1048576;
LimitNPROC = 1048576;
};
} // proxy_env;
};
systemd.sockets.docker = {
@ -99,7 +101,7 @@ in
# goes in config bundled with docker itself
LimitNOFILE = 1048576;
LimitNPROC = 1048576;
};
} // proxy_env;
# Presumably some containers are running we don't want to interrupt
restartIfChanged = false;