diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-17 17:35:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-17 17:35:32 +0000 |
| commit | 8a8820aed217268c81bd1e7f330b4ec091702a31 (patch) | |
| tree | a5c5837fd7ab0de24d06df2da2ea6d8b2a05fc0a | |
| parent | 451f54ae7075abef76705b5b916d97feccca3b78 (diff) | |
| parent | 1078eddf1161786e54225fbf3ecfa972b46b0450 (diff) | |
| download | kolla-8a8820aed217268c81bd1e7f330b4ec091702a31.tar.gz kolla-8a8820aed217268c81bd1e7f330b4ec091702a31.zip | |
Merge "Allow symlinks in the container build"
| -rwxr-xr-x | tools/build-docker-image | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/build-docker-image b/tools/build-docker-image index ac1277621..82d210d0c 100755 --- a/tools/build-docker-image +++ b/tools/build-docker-image @@ -88,10 +88,14 @@ if [ "$MODE" = "release" ]; then echo 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" exit 1 fi +rm -rf $TMPDIR echo "Built: $FULLIMAGE" |