isitdeployable

Merge lp:~ricardokirkner/isitdeployable/https_proxy-docker-build into lp:isitdeployable

  1. https_proxy-docker-build
  2. Merge into trunk
Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 234
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~ricardokirkner/isitdeployable/https_proxy-docker-build
Merge into: lp:isitdeployable
Diff against target: 21 lines (+4/-0)
1 file modified
Makefile.k8s (+4/-0)
To merge this branch: bzr merge lp:~ricardokirkner/isitdeployable/https_proxy-docker-build
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+329067@code.launchpad.net

Commit message

support https_proxy during docker build

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.k8s'
2--- Makefile.k8s 2017-08-15 17:08:47 +0000
3+++ Makefile.k8s 2017-08-15 19:52:17 +0000
4@@ -14,6 +14,7 @@
5 TLS_KEY ?= $(shell cat deployment/$(DOMAIN).key | base64 -w0)
6
7 HTTP_PROXY ?= $(http_proxy)
8+HTTPS_PROXY ?= $(https_proxy)
9 NO_PROXY ?= $(no_proxy)
10
11 # public targets
12@@ -35,6 +36,9 @@
13 ifneq ($(HTTP_PROXY),)
14 $(eval BUILD_ARGS = $(BUILD_ARGS) --build-arg http_proxy=$(HTTP_PROXY))
15 endif
16+ifneq ($(HTTPS_PROXY),)
17+ $(eval BUILD_ARGS = $(BUILD_ARGS) --build-arg https_proxy=$(HTTPS_PROXY))
18+endif
19 ifneq ($(NO_PROXY),)
20 $(eval BUILD_ARGS = $(BUILD_ARGS) --build-arg no_proxy=$(NO_PROXY))
21 endif

Subscribers

People subscribed via source and target branches