openstack/kolla
Code Issues Proposed changes

Fix image dependencies in build-all-docker-images

Browse Source 
Missing quotes around $FORCE_NAMESPACE was causing empty namespace
unless the --namespace switch was passed on the command line.

Change-Id: I474d67e133111bde7935b6f06ff3c8ca0f19d6cb
This commit is contained in:
Martin André 2015-02-24 17:12:54 +09:00
parent 617fc1097c
commit b323ca8332
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/build-all-docker-images
View File

@ -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]}' )