diff options
| author | Martin André <martin.andre@kvhasia.com> | 2015-02-24 17:12:54 +0900 |
|---|---|---|
| committer | Martin André <martin.andre@kvhasia.com> | 2015-02-26 15:01:51 +0900 |
| commit | b323ca83321191bec2f1fbba45a184ebf7a4a811 (patch) | |
| tree | 662b647be56047ee388e7831b8e023d493097c6d /tools | |
| parent | 617fc1097c01fcb8d2f1734ca538bac1c87d504d (diff) | |
| download | kolla-b323ca83321191bec2f1fbba45a184ebf7a4a811.tar.gz kolla-b323ca83321191bec2f1fbba45a184ebf7a4a811.zip | |
Fix image dependencies in build-all-docker-images
Missing quotes around $FORCE_NAMESPACE was causing empty namespace
unless the --namespace switch was passed on the command line.
Change-Id: I474d67e133111bde7935b6f06ff3c8ca0f19d6cb
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build-all-docker-images | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/build-all-docker-images b/tools/build-all-docker-images index 5f016f72c..2780d50e8 100755 --- a/tools/build-all-docker-images +++ b/tools/build-all-docker-images @@ -66,7 +66,7 @@ function init_image { set_defaults [ -f $TOPDIR/.buildconf ] && . $TOPDIR/.buildconf [ -f $img_dir/.buildconf ] && . $img_dir/.buildconf - [ -n $FORCE_NAMESPACE ] && NAMESPACE=$FORCE_NAMESPACE + [ -n "$FORCE_NAMESPACE" ] && NAMESPACE=$FORCE_NAMESPACE 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]}' ) |