diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-06 00:44:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-06 00:44:02 +0000 |
| commit | c3114b961086be034c6674a916361e2033c87986 (patch) | |
| tree | 0a957c08d9d7c1505b53231d2cd52aef09bf4dc9 /tools | |
| parent | eaf15893a0af7fef1825601bedbd2704a291dd33 (diff) | |
| parent | 0764fd7dea3f56627bb42e285cfb818cce08229e (diff) | |
| download | kolla-c3114b961086be034c6674a916361e2033c87986.tar.gz kolla-c3114b961086be034c6674a916361e2033c87986.zip | |
Merge "Allow changing base image"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build-all-docker-images | 2 | ||||
| -rwxr-xr-x | tools/build-docker-image | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/build-all-docker-images b/tools/build-all-docker-images index f8ae9f0b6..5a10fb90b 100755 --- a/tools/build-all-docker-images +++ b/tools/build-all-docker-images @@ -76,6 +76,8 @@ function init_image { local image="${NAMESPACE:+${NAMESPACE}/}${PREFIX}${img_dir##*/}" local base_image=$(cat $img_dir/Dockerfile | gawk 'match($0, /^\s*FROM\s+(\S+)/, matches) {print matches[1]}' ) + base_image=${base_image//%%KOLLA_NAMESPACE%%/$NAMESPACE} + base_image=${base_image//%%KOLLA_PREFIX%%/$PREFIX} img_dirs[$image]=$img_dir dependency[$image]=$base_image diff --git a/tools/build-docker-image b/tools/build-docker-image index f174a11f4..852c2dbf4 100755 --- a/tools/build-docker-image +++ b/tools/build-docker-image @@ -90,6 +90,10 @@ fi TMPDIR=$(mktemp -d /tmp/kolla-build.XXXXXXXXXX) cp -aL $IMGDIR/* $TMPDIR +# Use an extension for in-place editing for portability, as GNU and BSD +# versions of sed behave differently otherwise +sed -i.bak "s/%%KOLLA_NAMESPACE%%/${NAMESPACE}/g" $TMPDIR/Dockerfile +sed -i.bak "s/%%KOLLA_PREFIX%%/${PREFIX}/g" $TMPDIR/Dockerfile if ! docker build ${BUILDFLAGS} -t "$FULLIMAGE" $TMPDIR; then echo "ERROR: failed to build $FULLIMAGE" |