diff options
author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-11-08 13:06:56 +0100 |
---|---|---|
committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-11-08 13:06:56 +0100 |
commit | 53667c7b1a928e49a99052b65fa48ae7daa15fb1 (patch) | |
tree | 96029c1b4d6811e9ef88527a0b9de63e492de79c | |
parent | ba8e8ec8cf60e8bcf0d406d1c0132afd82b240ef (diff) | |
parent | 0d89afdeddf3c6680a340857536a12e56e6d1606 (diff) | |
download | nixlib-53667c7b1a928e49a99052b65fa48ae7daa15fb1.tar nixlib-53667c7b1a928e49a99052b65fa48ae7daa15fb1.tar.gz nixlib-53667c7b1a928e49a99052b65fa48ae7daa15fb1.tar.bz2 nixlib-53667c7b1a928e49a99052b65fa48ae7daa15fb1.tar.lz nixlib-53667c7b1a928e49a99052b65fa48ae7daa15fb1.tar.xz nixlib-53667c7b1a928e49a99052b65fa48ae7daa15fb1.tar.zst nixlib-53667c7b1a928e49a99052b65fa48ae7daa15fb1.zip |
Merge pull request #4870 from bosu/docker-proxy
docker: propagate nix.proxy into daemon environment
-rw-r--r-- | nixos/modules/virtualisation/docker.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 1ce066cdc73d..11d3f576728f 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -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; |