openstack/kolla-ansible
Code Issues Proposed changes

Merge "Set higher precedence for .buildconf file in image directory"

Browse Source
This commit is contained in:
Jenkins 2015-01-06 16:06:40 +00:00 committed by Gerrit Code Review
commit 3c51b6f7c9
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-docker-image
View File

@ -22,8 +22,8 @@ Options:
EOF
}
[ -f $IMGDIR/.buildconf ] && . $IMGDIR/.buildconf
[ -f $TOPDIR/.buildconf ] && . $TOPDIR/.buildconf
[ -f $IMGDIR/.buildconf ] && . $IMGDIR/.buildconf
ARGS=$(getopt -o 'n:t:pN' -l help,namespace:,push,release,tag:,no-cache -- "$@") || { usage >&2; exit 2; }