ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-18 10:46:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adding a flag, use_proxy_at_runtime, to use the same build proxy for

Browse Source 
runtime. otherwise variables rt_http_proxy and rt_https_proxy are need
to be set prior calling make, if there is a need to proxy for runtime.
This commit is contained in:
Arash Bannazadeh-Mahani 2016-06-30 10:37:52 -07:00
parent 324d187dc3
commit e5513c0635
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -6,7 +6,12 @@ ifdef https_proxy
DOCKER_HTTPS_PROXY=--build-arg https_proxy=$(https_proxy)
endif
DISABLE_CACHE = 'false'
ifdef use_proxy_at_runtime
rt_http_proxy=$(http_proxy)
rt_https_proxy=$(https_proxy)
endif
DISABLE_CACHE= 'false'
ARCH = rpi# rpi/amd64/i386/armv7hf/armel
BASE_DISTRO =
@ -85,13 +90,13 @@ supervisor: gosuper
echo "ENV DEFAULT_PUBNUB_PUBLISH_KEY $(PUBNUB_PUBLISH_KEY)" >> Dockerfile
echo "ENV DEFAULT_PUBNUB_SUBSCRIBE_KEY $(PUBNUB_SUBSCRIBE_KEY)" >> Dockerfile
echo "ENV DEFAULT_MIXPANEL_TOKEN $(MIXPANEL_TOKEN)" >> Dockerfile
ifdef https_proxy
echo "ENV HTTPS_PROXY $(https_proxy)" >> Dockerfile
echo "ENV https_proxy $(https_proxy)" >> Dockerfile
ifdef rt_https_proxy
echo "ENV HTTPS_PROXY $(rt_https_proxy)" >> Dockerfile
echo "ENV https_proxy $(rt_https_proxy)" >> Dockerfile
endif
ifdef http_proxy
echo "ENV HTTP_PROXY $(http_proxy)" >> Dockerfile
echo "ENV http_proxy $(http_proxy)" >> Dockerfile
ifdef rt_http_proxy
echo "ENV HTTP_PROXY $(rt_http_proxy)" >> Dockerfile
echo "ENV http_proxy $(rt_http_proxy)" >> Dockerfile
endif
docker build $(DOCKER_HTTP_PROXY) $(DOCKER_HTTPS_PROXY) --no-cache=$(DISABLE_CACHE) -t $(IMAGE) .
-rm Dockerfile