From 8599143069649fd59d97212bffe966c59b1146a1 Mon Sep 17 00:00:00 2001 From: Leno Hou Date: Wed, 31 Oct 2018 12:58:32 +0800 Subject: [PATCH] rootfs.sh: enable curl use http_proxy This patch added -x option to curl: -x uses the http_proxy settings to download golang binary behind the firewall Fixes: #193 Signed-off-by: Leno Hou --- rootfs-builder/rootfs.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rootfs-builder/rootfs.sh b/rootfs-builder/rootfs.sh index f700a72828..496bb62b51 100755 --- a/rootfs-builder/rootfs.sh +++ b/rootfs-builder/rootfs.sh @@ -140,8 +140,10 @@ generate_dockerfile() [ -n "$http_proxy" ] && readonly set_proxy="RUN sed -i '$ a proxy="$http_proxy"' /etc/dnf/dnf.conf /etc/yum.conf; true" + curlOptions=("-OL") + [ -n "$http_proxy" ] && curlOptions+=("-x $http_proxy") readonly install_go=" -RUN cd /tmp ; curl -OL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${goarch}.tar.gz +RUN cd /tmp ; curl ${curlOptions[@]} https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${goarch}.tar.gz RUN tar -C /usr/ -xzf /tmp/go${GO_VERSION}.linux-${goarch}.tar.gz ENV GOROOT=/usr/go ENV PATH=\$PATH:\$GOROOT/bin:\$GOPATH/bin