diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-26 13:23:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-26 13:23:58 +0000 |
| commit | 140942944735289a5b9ce422cc43557d0cd0b031 (patch) | |
| tree | dc84a99a375fdf59b239938160b75808936c65b9 /tools | |
| parent | e803c0e7a071faaea47d2b7c24bfb35b3fda1d80 (diff) | |
| parent | b323ca83321191bec2f1fbba45a184ebf7a4a811 (diff) | |
| download | kolla-140942944735289a5b9ce422cc43557d0cd0b031.tar.gz kolla-140942944735289a5b9ce422cc43557d0cd0b031.zip | |
Merge "Fix image dependencies in build-all-docker-images"
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]}' ) |