[PATCH 1/2] kas-docker: Pass in NO_PROXY

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

Required to control oe-git-proxy exceptions.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
kas-docker | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kas-docker b/kas-docker
index 097081f..e7d71ea 100755
--- a/kas-docker
+++ b/kas-docker
@@ -213,7 +213,7 @@ fi
set -- ${DOCKER_ARGS}

for var in SHELL TERM KAS_DISTRO KAS_MACHINE KAS_TARGET KAS_TASK \
- http_proxy https_proxy ftp_proxy no_proxy; do
+ http_proxy https_proxy ftp_proxy no_proxy NO_PROXY; do
if [ -n "$(eval echo \$${var})" ]; then
set -- "$@" -e "${var}='$(eval echo \$${var})'"
fi
--
2.16.4

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

Upstream oe-git-proxy has a bug [1] and currently does proxying
unconditionally, just being stopped in the absence of other proxy
settings. Patch in the fix until upstream picks it up.

[1] http://lists.openembedded.org/pipermail/openembedded-core/2019-January/278496.html

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

Dockerfile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e245f20..4f305d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,10 @@ RUN wget -nv -O /usr/bin/gosu "https://github.com/tianon/gosu/releases/download/
chmod +x /usr/bin/gosu

RUN wget -nv -O /usr/bin/oe-git-proxy "http://git.yoctoproject.org/cgit/cgit.cgi/poky/plain/scripts/oe-git-proxy" && \
- chmod +x /usr/bin/oe-git-proxy
+ chmod +x /usr/bin/oe-git-proxy && \
+ sed -e 's|for H in \${NO_PROXY//,/ }|for H in "${NO_PROXY//,/ }"|' \
+ -e 's| if match_host \$1 \$H| if match_host $1 "$H"|' \
+ -i /usr/bin/oe-git-proxy
ENV GIT_PROXY_COMMAND="oe-git-proxy"
ENV NO_PROXY="*"

--
2.16.4

[Daniel Wagner]

Hi Jan,

Both patches applied on next.

Thanks,
Daniel