From 363eca077ce2daa4970a7ab0a0d5b8e8640dc61f Mon Sep 17 00:00:00 2001 From: Henning Schild Date: Wed, 18 Sep 2019 16:00:19 +0200 Subject: [PATCH] Revert "Dockerfile: Patch oe-git-proxy to truly disable proxying by default" This reverts commit 7bd738a43c502e89522deadffd534a857e9cfc6e. The bug has been fixed upstream, ne need to patch the script anymore. Signed-off-by: Henning Schild Signed-off-by: Jan Kiszka --- Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 940937b..e508dd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,10 +25,7 @@ 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 && \ - 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 + chmod +x /usr/bin/oe-git-proxy ENV GIT_PROXY_COMMAND="oe-git-proxy" ENV NO_PROXY="*"