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

Merge pull request #25245 from bachp/docker-proxy

Browse Source 
docker: pass all proxy variables to docker daemon
This commit is contained in:
Jörg Thalheim 2017-04-27 11:03:46 +02:00 committed by GitHub
commit 7b96e3d6a7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,8 +7,7 @@ with lib;
let let
cfg = config.virtualisation.docker; cfg = config.virtualisation.docker;
pro = config.networking.proxy.default; proxy_env = config.networking.proxy.envVars;
proxy_env = optionalAttrs (pro != null) { Environment = "\"http_proxy=${pro}\""; };
in in
@ -106,6 +105,7 @@ in
systemd.services.docker = { systemd.services.docker = {
wantedBy = optional cfg.enableOnBoot "multi-user.target"; wantedBy = optional cfg.enableOnBoot "multi-user.target";
environment = proxy_env;
serviceConfig = { serviceConfig = {
ExecStart = [ ExecStart = [
"" ""
@ -122,7 +122,7 @@ in
"" ""
"${pkgs.procps}/bin/kill -s HUP $MAINPID" "${pkgs.procps}/bin/kill -s HUP $MAINPID"
]; ];
} // proxy_env; };
path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
}; };