diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-12 15:48:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-12 15:48:25 +0000 |
| commit | 4aacc43e96cf045f3ed0d9fdd0e9b1b912c6b56b (patch) | |
| tree | 9819e3065557337ea2c528fa01edb4aef2bdd614 /tools | |
| parent | 57990a94aeac87e2ba5e25848215dcd4a0dbb9e3 (diff) | |
| parent | 95234ea533fffd1260e443933de271256cd4caef (diff) | |
| download | kolla-4aacc43e96cf045f3ed0d9fdd0e9b1b912c6b56b.tar.gz kolla-4aacc43e96cf045f3ed0d9fdd0e9b1b912c6b56b.zip | |
Merge "Additional option to cleanup even failed containers"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build-docker-image | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/build-docker-image b/tools/build-docker-image index 2aec82236..5d85f6263 100755 --- a/tools/build-docker-image +++ b/tools/build-docker-image @@ -18,7 +18,9 @@ Options: --namespace, -n <namespace> --tag, -t <tag> --push, -p +--force-rm, -f --no-cache, -N +--pull, -u --release --no-use-released-parent EOF @@ -27,7 +29,7 @@ EOF [ -f $TOPDIR/.buildconf ] && . $TOPDIR/.buildconf [ -f $IMGDIR/.buildconf ] && . $IMGDIR/.buildconf -ARGS=$(getopt -o hn:t:pN -l help,namespace:,push,release,tag:,no-cache,no-use-released-parent -- "$@") || { usage >&2; exit 2; } +ARGS=$(getopt -o hn:t:pfuN -l help,namespace:,push,pull,release,tag:,force-rm,no-cache,no-use-released-parent -- "$@") || { usage >&2; exit 2; } eval set -- "$ARGS" @@ -50,6 +52,13 @@ while :; do (--push|-p) PUSH=1 ;; + (--pull|-u) BUILDFLAGS="${BUILDFLAGS} --pull=true" + ;; + + (--force-rm|-f) + BUILDFLAGS="${BUILDFLAGS} --force-rm=true" + ;; + (--no-cache|-N) BUILDFLAGS="${BUILDFLAGS} --no-cache" ;; |