From 57493aff51f8cde3a96b8b701359c464b3c09713 Mon Sep 17 00:00:00 2001 From: bandesz Date: Tue, 20 Dec 2016 11:04:29 +0000 Subject: [PATCH] Fix apt proxy and curl proxy in Docker --- docker/Dockerfile-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile-build b/docker/Dockerfile-build index 786737a10..114b230c9 100644 --- a/docker/Dockerfile-build +++ b/docker/Dockerfile-build @@ -10,7 +10,7 @@ ENV PYTHONUNBUFFERED=1 \ RUN \ echo "Install base packages" \ - && ([ -z "$HTTP_PROXY" ] || echo "Acquire::http::Proxy \"${HTTP_PROXY}\";\n" > /etc/apt/apt.conf.d/99HttpProxy) \ + && ([ -z "$HTTP_PROXY" ] || echo "Acquire::http::Proxy \"${HTTP_PROXY}\";" > /etc/apt/apt.conf.d/99HttpProxy) \ && apt-get update \ && apt-get install -y --no-install-recommends \ apt-transport-https \ @@ -39,7 +39,7 @@ RUN \ && echo "Install nodejs" \ && cd /tmp \ - && curl -sSLO https://deb.nodesource.com/node_6.x/pool/main/n/nodejs/nodejs_${NODEJS_VERSION}_amd64.deb \ + && curl -x "$HTTP_PROXY" -sSLO https://deb.nodesource.com/node_6.x/pool/main/n/nodejs/nodejs_${NODEJS_VERSION}_amd64.deb \ && dpkg -i /tmp/nodejs_${NODEJS_VERSION}_amd64.deb \ && echo "Clean up" \