зеркало из https://github.com/microsoft/docker.git
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>
This commit is contained in:
Родитель
9ebb90883e
Коммит
062ce13e9c
|
@ -139,7 +139,7 @@ set -e
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
tempImage="docker-temp/build-rpm:$version"
|
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 run --rm "$tempImage" bash -c 'cd /root/rpmbuild && tar -c *RPMS' | tar -xvC "$DEST/$version"
|
||||||
docker rmi "$tempImage"
|
docker rmi "$tempImage"
|
||||||
done
|
done
|
||||||
|
|
Загрузка…
Ссылка в новой задаче