beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #18933 from coolljt0725/always_build

Browse source 
Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm
This commit is contained in:
Arnaud Porterie 2015-12-29 11:53:06 -08:00
commit 3858027e27
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/make/build-deb
View file

@ -44,7 +44,7 @@ set -e
image="dockercore/builder-deb:$version"
if ! docker inspect "$image" &> /dev/null; then
( set -x && docker build -t "$image" "$dir" )
( set -x && docker build ${DOCKER_BUILD_ARGS} -t "$image" "$dir" )
fi
mkdir -p "$DEST/$version"

2
hack/make/build-rpm
View file

@ -67,7 +67,7 @@ set -e
image="dockercore/builder-rpm:$version"
if ! docker inspect "$image" &> /dev/null; then
( set -x && docker build -t "$image" "$dir" )
( set -x && docker build ${DOCKER_BUILD_ARGS} -t "$image" "$dir" )
fi
mkdir -p "$DEST/$version"