diff options
| author | Martin André <martin.andre@kvhasia.com> | 2014-12-29 15:03:11 +0900 |
|---|---|---|
| committer | Martin André <martin.andre@kvhasia.com> | 2015-01-05 10:27:35 +0900 |
| commit | e07d274a615d65efb88d166f1d5cd9e4ef411742 (patch) | |
| tree | c934174effceeb3a2651d68f7e862bcd5f9aa5cb /tools/build-docker-image | |
| parent | 1fcf0bee5fbf455c547db6bd4a581680faf303a8 (diff) | |
| download | kolla-e07d274a615d65efb88d166f1d5cd9e4ef411742.tar.gz kolla-e07d274a615d65efb88d166f1d5cd9e4ef411742.zip | |
Set higher precedence for .buildconf file in image directory
Source .buildconf file in $IMGDIR last in order to prevent silently
overloading configuration by the less specific $TOPDIR/.buildconf.
Change-Id: Ia38101b6d4743b454dc2c8ba48d3b55af47ed53b
Diffstat (limited to 'tools/build-docker-image')
| -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; } |