Merge pull request #613 from Capgemini/fixes-582

fixes-582 proxy and tmpdir for docker.
Capgemini · Jan 8, 2016 · 4af446a · 4af446a
2 parents 40755ee + 57da923
commit 4af446a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/roles/docker/templates/docker.service.j2 b/roles/docker/templates/docker.service.j2
@@ -6,6 +6,11 @@ Requires=docker.socket early-docker.target
 
 [Service]
 EnvironmentFile=-/run/flannel_docker_opts.env
+{% if http_proxy is defined and http_proxy != '' %}
+Environment="HTTP_PROXY={{ http_proxy }}"
+{% endif %}
+Environment="DOCKER_TMPDIR={{ docker_tmp_dir }}"
+
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576