openstack/kolla
Code Issues Proposed changes

Merge "Allow symlinks in the container build"

Browse Source
This commit is contained in:
Jenkins 2015-02-17 17:35:32 +00:00 committed by Gerrit Code Review
commit 8a8820aed2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/build-docker-image
View File

@ -88,10 +88,14 @@ if [ "$MODE" = "release" ]; then
echo echo
fi fi
if ! docker build ${BUILDFLAGS} -t "$FULLIMAGE" $IMGDIR; then TMPDIR=$(mktemp -d /tmp/output.XXXXXXXXXX)
cp -aL $IMGDIR/* $TMPDIR
if ! docker build ${BUILDFLAGS} -t "$FULLIMAGE" $TMPDIR; then
echo "ERROR: failed to build $FULLIMAGE" echo "ERROR: failed to build $FULLIMAGE"
exit 1 exit 1
fi fi
rm -rf $TMPDIR
echo "Built: $FULLIMAGE" echo "Built: $FULLIMAGE"