openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix image dependencies in build-all-docker-images"

Browse Source
This commit is contained in:
Jenkins 2015-02-26 13:23:58 +00:00 committed by Gerrit Code Review
commit 1409429447
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 set_defaults
[ -f $TOPDIR/.buildconf ] && . $TOPDIR/.buildconf [ -f $TOPDIR/.buildconf ] && . $TOPDIR/.buildconf
[ -f $img_dir/.buildconf ] && . $img_dir/.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 image="${NAMESPACE:+${NAMESPACE}/}${PREFIX}${img_dir##*/}"
local base_image=$(cat $img_dir/Dockerfile | gawk 'match($0, /^\s*FROM\s+(\S+)/, matches) {print matches[1]}' ) local base_image=$(cat $img_dir/Dockerfile | gawk 'match($0, /^\s*FROM\s+(\S+)/, matches) {print matches[1]}' )