Re-order flags in bash completion

and remove unnecessary variables from build command.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-11-10 13:11:59 -05:00
parent c5c36d8b00
commit 338bbb5063
2 changed files with 6 additions and 5 deletions

View File

@ -184,10 +184,11 @@ class TopLevelCommand(DocoptCommand):
--no-cache Do not use cache when building the image. --no-cache Do not use cache when building the image.
--pull Always attempt to pull a newer version of the image. --pull Always attempt to pull a newer version of the image.
""" """
force_rm = bool(options.get('--force-rm', False)) project.build(
no_cache = bool(options.get('--no-cache', False)) service_names=options['SERVICE'],
pull = bool(options.get('--pull', False)) no_cache=bool(options.get('--no-cache', False)),
project.build(service_names=options['SERVICE'], no_cache=no_cache, pull=pull, force_rm=force_rm) pull=bool(options.get('--pull', False)),
force_rm=bool(options.get('--force-rm', False)))
def help(self, project, options): def help(self, project, options):
""" """

View File

@ -93,7 +93,7 @@ __docker_compose_services_stopped() {
_docker_compose_build() { _docker_compose_build() {
case "$cur" in case "$cur" in
-*) -*)
COMPREPLY=( $( compgen -W "--help --force-rm --no-cache --pull" -- "$cur" ) ) COMPREPLY=( $( compgen -W "--force-rm --help --no-cache --pull" -- "$cur" ) )
;; ;;
*) *)
__docker_compose_services_from_build __docker_compose_services_from_build