From ea7c288dc3e44e77cfdf33c634a9e5499c7a2cd1 Mon Sep 17 00:00:00 2001
From: chris060986 <christoph.birk@gmail.com>
Date: Thu, 20 Dec 2018 14:41:06 +0100
Subject: [PATCH 1/3] Add proxy support to build

---
 Makefile  | 7 +++++--
 README.md | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 89bc555..7afe05f 100644
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,8 @@ bin/$(OS)_$(ARCH)/$(BIN): build-dirs
 	    -v $$(pwd)/bin/$(OS)_$(ARCH):/go/bin/$(OS)_$(ARCH)                       \
 	    -v $$(pwd)/.go/std/$(OS)_$(ARCH):/usr/local/go/pkg/$(OS)_$(ARCH)_static  \
 	    -v $$(pwd)/.go/cache:/.cache                                             \
+            --env HTTP_PROXY=$(HTTP_PROXY)                                 	     \
+            --env HTTPS_PROXY=$(HTTPS_PROXY)                                         \
 	    -w /go/src/$(PKG)                                                        \
 	    --rm                                                                     \
 	    $(BUILD_IMAGE)                                                           \
@@ -110,7 +112,6 @@ bin/$(OS)_$(ARCH)/$(BIN): build-dirs
 	    "
 
 DOTFILE_IMAGE = $(subst /,_,$(IMAGE))-$(TAG)
-
 container: .container-$(DOTFILE_IMAGE) container-name
 .container-$(DOTFILE_IMAGE): bin/$(OS)_$(ARCH)/$(BIN) Dockerfile.in
 	@sed \
@@ -119,7 +120,7 @@ container: .container-$(DOTFILE_IMAGE) container-name
 	    -e 's|{ARG_OS}|$(OS)|g' \
 	    -e 's|{ARG_FROM}|$(BASEIMAGE)|g' \
 	    Dockerfile.in > .dockerfile-$(OS)_$(ARCH)
-	@docker build -t $(IMAGE):$(TAG) -f .dockerfile-$(OS)_$(ARCH) .
+	@docker build --build-arg HTTP_PROXY=$(HTTP_PROXY) --build-arg=$(HTTPS_PROXY) -t $(IMAGE):$(TAG) -f .dockerfile-$(OS)_$(ARCH) .
 	@docker images -q $(IMAGE):$(TAG) > $@
 
 container-name:
@@ -155,6 +156,8 @@ test: build-dirs
 	    -v $$(pwd)/bin/$(OS)_$(ARCH):/go/bin                                     \
 	    -v $$(pwd)/.go/std/$(OS)_$(ARCH):/usr/local/go/pkg/$(OS)_$(ARCH)_static  \
 	    -v $$(pwd)/.go/cache:/.cache                                             \
+            --env HTTP_PROXY=$(HTTP_PROXY)                                 	     \
+            --env HTTPS_PROXY=$(HTTPS_PROXY)                               	     \
 	    -w /go/src/$(PKG)                                                        \
 	    $(BUILD_IMAGE)                                                           \
 	    /bin/sh -c "                                                             \
diff --git a/README.md b/README.md
index 46c3f34..ec6754a 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,9 @@ symlink.
 # build the container
 make container REGISTRY=registry VERSION=tag
 
+# build the container behind a proxy
+make container REGISTRY=registry VERSION=tag HTTP_PROXY=http://<proxy_address>:<proxy_port> HTTPS_PROXY=https://<proxy_address>:<proxy_port>
+
 # run the container
 docker run -d \
     -v /tmp/git-data:/tmp/git \

From 59f5554348fe8ec424d02c3f23f7e0d676153a93 Mon Sep 17 00:00:00 2001
From: chris060986 <christoph.birk@gmail.com>
Date: Wed, 16 Jan 2019 09:15:34 +0100
Subject: [PATCH 2/3] Fix intention of makefile

---
 Makefile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7afe05f..b6c985a 100644
--- a/Makefile
+++ b/Makefile
@@ -98,8 +98,8 @@ bin/$(OS)_$(ARCH)/$(BIN): build-dirs
 	    -v $$(pwd)/bin/$(OS)_$(ARCH):/go/bin/$(OS)_$(ARCH)                       \
 	    -v $$(pwd)/.go/std/$(OS)_$(ARCH):/usr/local/go/pkg/$(OS)_$(ARCH)_static  \
 	    -v $$(pwd)/.go/cache:/.cache                                             \
-            --env HTTP_PROXY=$(HTTP_PROXY)                                 	     \
-            --env HTTPS_PROXY=$(HTTPS_PROXY)                                         \
+	    --env HTTP_PROXY=$(HTTP_PROXY)                                           \
+	    --env HTTPS_PROXY=$(HTTPS_PROXY)                                         \
 	    -w /go/src/$(PKG)                                                        \
 	    --rm                                                                     \
 	    $(BUILD_IMAGE)                                                           \
@@ -112,6 +112,7 @@ bin/$(OS)_$(ARCH)/$(BIN): build-dirs
 	    "
 
 DOTFILE_IMAGE = $(subst /,_,$(IMAGE))-$(TAG)
+
 container: .container-$(DOTFILE_IMAGE) container-name
 .container-$(DOTFILE_IMAGE): bin/$(OS)_$(ARCH)/$(BIN) Dockerfile.in
 	@sed \
@@ -120,7 +121,12 @@ container: .container-$(DOTFILE_IMAGE) container-name
 	    -e 's|{ARG_OS}|$(OS)|g' \
 	    -e 's|{ARG_FROM}|$(BASEIMAGE)|g' \
 	    Dockerfile.in > .dockerfile-$(OS)_$(ARCH)
-	@docker build --build-arg HTTP_PROXY=$(HTTP_PROXY) --build-arg=$(HTTPS_PROXY) -t $(IMAGE):$(TAG) -f .dockerfile-$(OS)_$(ARCH) .
+	@docker build \
+	    --build-arg HTTP_PROXY=$(HTTP_PROXY) \
+	    --build-arg=$(HTTPS_PROXY) \
+	    -t $(IMAGE):$(TAG) \
+	    -f .dockerfile-$(OS)_$(ARCH) \
+	    .
 	@docker images -q $(IMAGE):$(TAG) > $@
 
 container-name:
@@ -156,8 +162,8 @@ test: build-dirs
 	    -v $$(pwd)/bin/$(OS)_$(ARCH):/go/bin                                     \
 	    -v $$(pwd)/.go/std/$(OS)_$(ARCH):/usr/local/go/pkg/$(OS)_$(ARCH)_static  \
 	    -v $$(pwd)/.go/cache:/.cache                                             \
-            --env HTTP_PROXY=$(HTTP_PROXY)                                 	     \
-            --env HTTPS_PROXY=$(HTTPS_PROXY)                               	     \
+	    --env HTTP_PROXY=$(HTTP_PROXY)                                           \
+	    --env HTTPS_PROXY=$(HTTPS_PROXY)                                         \
 	    -w /go/src/$(PKG)                                                        \
 	    $(BUILD_IMAGE)                                                           \
 	    /bin/sh -c "                                                             \

From e37fa08e742554c242526d83306a752e59810ae1 Mon Sep 17 00:00:00 2001
From: chris060986 <christoph.birk@gmail.com>
Date: Wed, 23 Jan 2019 07:34:57 +0100
Subject: [PATCH 3/3] Fix docker build arg for https proxy

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b6c985a..a7ee40d 100644
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,7 @@ container: .container-$(DOTFILE_IMAGE) container-name
 	    Dockerfile.in > .dockerfile-$(OS)_$(ARCH)
 	@docker build \
 	    --build-arg HTTP_PROXY=$(HTTP_PROXY) \
-	    --build-arg=$(HTTPS_PROXY) \
+	    --build-arg HTTPS_PROXY=$(HTTPS_PROXY) \
 	    -t $(IMAGE):$(TAG) \
 	    -f .dockerfile-$(OS)_$(ARCH) \
 	    .