openstack/kolla-ansible
Code Issues Proposed changes

Merge "Additional option to cleanup even failed containers"

Browse Source
This commit is contained in:
Jenkins 2015-05-12 15:48:25 +00:00 committed by Gerrit Code Review
commit 4aacc43e96
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/build-docker-image
View File

@ -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"
;;