ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-12 04:18:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #240 from resin-io/fix-makefile

Browse Source 
Fix proxies assignment in Makefile
This commit is contained in:
Pablo Carranza Vélez
2016-08-26 18:20:00 -03:00
committed by GitHub
parent 6de51543a5 a20084d906
commit 4f6f59b80e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -85,17 +85,17 @@ DOCKERD_PROXY=tools/dind/config/services/docker.service.d/proxy.conf
${DOCKERD_PROXY}: ${DOCKERD_PROXY}:
rm -f ${DOCKERD_PROXY} rm -f ${DOCKERD_PROXY}
if [ -n "${rt_http_proxy}" ]; then \ if [ -n "${rt_http_proxy}" ]; then \
proxies=("\"HTTP_PROXY=${rt_http_proxy}\""); \ proxies="\"HTTP_PROXY=${rt_http_proxy}\""; \
proxies=($${proxies[*]} "\"http_proxy=${rt_http_proxy}\""); \ proxies="$${proxies[*]} \"http_proxy=${rt_http_proxy}\""; \
fi; \ fi; \
if [ -n "${rt_https_proxy}" ]; then \ if [ -n "${rt_https_proxy}" ]; then \
proxies=($${proxies[*]} "\"HTTPS_PROXY=${rt_https_proxy}\""); \ proxies="$${proxies[*]} \"HTTPS_PROXY=${rt_https_proxy}\""; \
proxies=($${proxies[*]} "\"https_proxy=${rt_https_proxy}\""); \ proxies="$${proxies[*]} \"https_proxy=${rt_https_proxy}\""; \
fi; \ fi; \
if [ -n "${rt_no_proxy}" ]; then \ if [ -n "${rt_no_proxy}" ]; then \
proxies=($${proxies[*]} "\"no_proxy=${rt_no_proxy}\""); \ proxies="$${proxies[*]} \"no_proxy=${rt_no_proxy}\""; \
fi; \ fi; \
if [ -n "$${proxies[*]}" ]; then \ if [ -n "${proxies}" ]; then \
echo "[Service]" > ${DOCKERD_PROXY}; \ echo "[Service]" > ${DOCKERD_PROXY}; \
echo "Environment=$${proxies[*]}" >> ${DOCKERD_PROXY}; \ echo "Environment=$${proxies[*]}" >> ${DOCKERD_PROXY}; \
else \ else \