From 3b675a4101849dfe03263a61d95f8b69bd5f5ff9 Mon Sep 17 00:00:00 2001 From: Zhang Wei Date: Tue, 17 Jan 2017 20:10:48 +0800 Subject: [PATCH] Add missing ${DOCKER_BUILD_ARGS} Add missing "${DOCKER_BUILD_ARGS}" for building rpm with `docker build`, this is quite important when running `make rpm` behind http proxy. Signed-off-by: Zhang Wei Upstream-commit: 062ce13e9cc6a9eb8ea8ae6333ff1dcc915572c4 Component: engine --- components/engine/hack/make/build-rpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/hack/make/build-rpm b/components/engine/hack/make/build-rpm index 7fec059392..f5e2c7240a 100644 --- a/components/engine/hack/make/build-rpm +++ b/components/engine/hack/make/build-rpm @@ -139,7 +139,7 @@ set -e EOF fi tempImage="docker-temp/build-rpm:$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 /root/rpmbuild && tar -c *RPMS' | tar -xvC "$DEST/$version" docker rmi "$tempImage" done