From a8eab9725ac5162fe8739672ba60de626a494f43 Mon Sep 17 00:00:00 2001 From: Luiz Svoboda Date: Tue, 6 Dec 2016 10:17:41 -0200 Subject: [PATCH] Add variable DOCKER_BUILD_ARGS to build-deb script Some containers were being built (`docker build`) without the DOCKER_BUILD_ARGS variable, which was causing some issues because of the lack of network proxy configuration. Fixes #29132 Signed-off-by: Luiz Svoboda Upstream-commit: 63aaf5e316d7b51db9be94bcb16dab07fdf1fdb4 Component: engine --- components/engine/hack/make/build-deb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/hack/make/build-deb b/components/engine/hack/make/build-deb index d3c28591a6..33f924040c 100644 --- a/components/engine/hack/make/build-deb +++ b/components/engine/hack/make/build-deb @@ -82,7 +82,7 @@ set -e RUN dpkg-buildpackage -uc -us -I.git EOF tempImage="docker-temp/build-deb:$version" - ( set -x && docker build -t "$tempImage" -f "$DEST/$version/Dockerfile.build" . ) + ( set -x && docker build ${DOCKER_BUILD_ARGS} -t "$tempImage" -f "$DEST/$version/Dockerfile.build" . ) docker run --rm "$tempImage" bash -c 'cd .. && tar -c *_*' | tar -xvC "$DEST/$version" docker rmi "$tempImage" done