From 57da92344e28f7446781a89b797e0c9a8756c2e2 Mon Sep 17 00:00:00 2001
From: enxebre <alberto.garcial@hotmail.com>
Date: Fri, 8 Jan 2016 16:03:34 +0100
Subject: [PATCH] fixes-582 proxy and tmpdir for docker.

---
 roles/docker/templates/docker.service.j2 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roles/docker/templates/docker.service.j2 b/roles/docker/templates/docker.service.j2
index 933c37f0..9f2fde28 100644
--- 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