Merge pull request #4870 from bosu/docker-proxy

docker: propagate nix.proxy into daemon environment
This commit is contained in:
Jaka Hudoklin 2014-11-08 13:06:56 +01:00
commit 53667c7b1a

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;