diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-06 16:06:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-06 16:06:40 +0000 |
| commit | 3c51b6f7c9b05f24022581b3896309385cb54d2f (patch) | |
| tree | 363d57a61df0b75964c73be2da6781e29b9595ec | |
| parent | 8d66ded6bdeedd2367933159565a7de0046ffb3a (diff) | |
| parent | e07d274a615d65efb88d166f1d5cd9e4ef411742 (diff) | |
| download | kolla-3c51b6f7c9b05f24022581b3896309385cb54d2f.tar.gz kolla-3c51b6f7c9b05f24022581b3896309385cb54d2f.zip | |
Merge "Set higher precedence for .buildconf file in image directory"
| -rwxr-xr-x | tools/build-docker-image | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/build-docker-image b/tools/build-docker-image index 370463dd2..080eb768b 100755 --- a/tools/build-docker-image +++ b/tools/build-docker-image @@ -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; } |
