From f393fa04421c9979bf8f866acaa0ba3b23c6b145 Mon Sep 17 00:00:00 2001 From: Dave Bevan Date: Wed, 25 Jan 2017 17:37:26 +0000 Subject: [PATCH] Behind-proxy support for herokuish install Inject http proxy envvars to docker build command to allow package installation behind corporate proxies. These envvars (http_proxy and https_proxy) are standard, and usually configured via system-wide /etc/profile.d files. In cases where these envvars are not configured, the additions appear to be mute and non-destructive. --- deb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb.mk b/deb.mk index eac9a9ced..ab1e831c7 100644 --- a/deb.mk +++ b/deb.mk @@ -92,7 +92,7 @@ deb-herokuish: @echo " sudo docker rmi gliderlabs/herokuish" >> /tmp/tmp/post-install @echo "fi" >> /tmp/tmp/post-install @echo "echo 'Importing herokuish into docker (around 5 minutes)'" >> /tmp/tmp/post-install - @echo "sudo docker build -t gliderlabs/herokuish /var/lib/herokuish 1> /dev/null" >> /tmp/tmp/post-install + @echo "sudo docker build --build-args http_proxy=$http_proxy --build-args https_proxy=$https_proxy -t gliderlabs/herokuish /var/lib/herokuish 1> /dev/null" >> /tmp/tmp/post-install @echo "-> Cloning repository" git clone -q "https://github.com/$(HEROKUISH_REPO_NAME).git" --branch "v$(HEROKUISH_VERSION)" /tmp/tmp/herokuish > /dev/null