1. docker
  2. Commit 062ce13e9cc6a9eb8ea8ae6333ff1dcc915572c4
Browse code

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 <zhangwei555@huawei.com>

Zhang Wei authored on 2017/01/17 21:10:48
Showing 1 changed files
hack/make/build-rpm
History View file @ 062ce13
... ... 
@@ -139,7 +139,7 @@ set -e
139 139 
 			EOF
140 140 
 		fi
141 141 
 		tempImage="docker-temp/build-rpm:$version"
142 
-		( set -x && docker build -t "$tempImage" -f $DEST/$version/Dockerfile.build . )
142 
+		( set -x && docker build ${DOCKER_BUILD_ARGS} -t "$tempImage" -f $DEST/$version/Dockerfile.build . )
143 143 
 		docker run --rm "$tempImage" bash -c 'cd /root/rpmbuild && tar -c *RPMS' | tar -xvC "$DEST/$version"
144 144 
 		docker rmi "$tempImage"
145 145 
 	done