diff options
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 2780d50e8..d49d0ac92 100755 --- a/tools/build-all-docker-images +++ b/tools/build-all-docker-images @@ -70,6 +70,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 82d210d0c..fae5cab98 100755 --- a/tools/build-docker-image +++ b/tools/build-docker-image @@ -90,6 +90,10 @@ fi TMPDIR=$(mktemp -d /tmp/output.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" |