diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-04-27 11:03:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 11:03:46 +0200 |
| commit | 7b96e3d6a75499310fec130b86c92c313eb86345 (patch) | |
| tree | 84bcd1d205811d79f332a421ae9add48383baedf /nixos/modules/virtualisation | |
| parent | cd4d91eb11f2e99476794ba708b50c7a4d11ef57 (diff) | |
| parent | 846f36203c99090c3f455dcf07aba64825f7c4b8 (diff) | |
| download | nixlib-7b96e3d6a75499310fec130b86c92c313eb86345.tar nixlib-7b96e3d6a75499310fec130b86c92c313eb86345.tar.gz nixlib-7b96e3d6a75499310fec130b86c92c313eb86345.tar.bz2 nixlib-7b96e3d6a75499310fec130b86c92c313eb86345.tar.lz nixlib-7b96e3d6a75499310fec130b86c92c313eb86345.tar.xz nixlib-7b96e3d6a75499310fec130b86c92c313eb86345.tar.zst nixlib-7b96e3d6a75499310fec130b86c92c313eb86345.zip | |
Merge pull request #25245 from bachp/docker-proxy
docker: pass all proxy variables to docker daemon
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/docker.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index f1101d7ea66e..c26cae06cd1d 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -7,8 +7,7 @@ with lib; let cfg = config.virtualisation.docker; - pro = config.networking.proxy.default; - proxy_env = optionalAttrs (pro != null) { Environment = "\"http_proxy=${pro}\""; }; + proxy_env = config.networking.proxy.envVars; in @@ -106,6 +105,7 @@ in systemd.services.docker = { wantedBy = optional cfg.enableOnBoot "multi-user.target"; + environment = proxy_env; serviceConfig = { ExecStart = [ "" @@ -122,7 +122,7 @@ in "" "${pkgs.procps}/bin/kill -s HUP $MAINPID" ]; - } // proxy_env; + }; path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); }; |