From 21477d9576df8719b1049f8c26f0d04983aa5bd8 Mon Sep 17 00:00:00 2001 From: Kyle Spiers Date: Thu, 3 May 2018 12:42:41 -0700 Subject: [PATCH 1/9] update docker Events subcommand completions Signed-off-by: Kyle Spiers --- contrib/completion/fish/docker.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index c0f300aca38d..ef7fb842b27e 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -274,11 +274,11 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from diff' -a '(__fish_print # events complete -c docker -f -n '__fish_docker_no_subcommand' -a events -d 'Get real time events from the server' -complete -c docker -A -f -n '__fish_seen_subcommand_from events' -s f -l filter -d "Provide filter values (i.e., 'event=stop')" +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -s f -l filter -d "Filter output based on conditions provided" +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l format -d 'Format the output using the given Go template' complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l help -d 'Print usage' complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l since -d 'Show all events created since timestamp' complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l until -d 'Stream events until this timestamp' -complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l format -d 'Format the output using the given go template' # exec complete -c docker -f -n '__fish_docker_no_subcommand' -a exec -d 'Run a command in a running container' From 3eb6b2c9c0eca68abbf06d8535ebaa50e0233ace Mon Sep 17 00:00:00 2001 From: Kyle Spiers Date: Thu, 3 May 2018 12:48:25 -0700 Subject: [PATCH 2/9] update docker Exec subcommand completions Signed-off-by: Kyle Spiers --- contrib/completion/fish/docker.fish | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index ef7fb842b27e..a064a7f84516 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -283,9 +283,13 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l until -d 'St # exec complete -c docker -f -n '__fish_docker_no_subcommand' -a exec -d 'Run a command in a running container' complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s d -l detach -d 'Detached mode: run command in the background' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -l detach-keys -d 'Override the key sequence for detaching a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s e -l env -d 'Set environment variables' complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -l help -d 'Print usage' complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s i -l interactive -d 'Keep STDIN open even if not attached' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -l privileged -d 'Give extended privileges to the command' complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s t -l tty -d 'Allocate a pseudo-TTY' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s u -l user -d 'Username or UID (format: [:])' complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s w -l workdir -d 'Working directory inside the container' complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -a '(__fish_print_docker_containers running)' -d "Container" From fb16dc68bee0df4b4307adfe6f5e1cf71825e866 Mon Sep 17 00:00:00 2001 From: Kyle Spiers Date: Sat, 5 May 2018 01:07:32 -0700 Subject: [PATCH 3/9] update docker Export subcommand completions Signed-off-by: Kyle Spiers --- contrib/completion/fish/docker.fish | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index a064a7f84516..0b74e5905979 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -296,6 +296,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -a '(__fish_print # export complete -c docker -f -n '__fish_docker_no_subcommand' -a export -d 'Stream the contents of a container as a tar archive' complete -c docker -A -f -n '__fish_seen_subcommand_from export' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from export' -s o -l output -d 'Write to a file, instead of STDOUT' complete -c docker -A -f -n '__fish_seen_subcommand_from export' -a '(__fish_print_docker_containers all)' -d "Container" # history From ba4e802b4f5870d914eeb8ae59e9949481ca62b0 Mon Sep 17 00:00:00 2001 From: Kyle Spiers Date: Sat, 5 May 2018 01:17:44 -0700 Subject: [PATCH 4/9] update docker History subcommand completions Signed-off-by: Kyle Spiers --- contrib/completion/fish/docker.fish | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index 0b74e5905979..687dfd185d87 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -301,7 +301,9 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from export' -a '(__fish_pri # history complete -c docker -f -n '__fish_docker_no_subcommand' -a history -d 'Show the history of an image' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l format -d 'Pretty-print images using a Go template' complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -s H -l human -d 'Print sizes and dates in human readable format' complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l no-trunc -d "Don't truncate output" complete -c docker -A -f -n '__fish_seen_subcommand_from history' -s q -l quiet -d 'Only show numeric IDs' complete -c docker -A -f -n '__fish_seen_subcommand_from history' -a '(__fish_print_docker_images)' -d "Image" From 82c5693cf98da9d897ec00fff40df3eff014b2de Mon Sep 17 00:00:00 2001 From: Kyle Spiers Date: Sat, 5 May 2018 01:19:35 -0700 Subject: [PATCH 5/9] update docker Images subcommand completions Signed-off-by: Kyle Spiers --- contrib/completion/fish/docker.fish | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index 687dfd185d87..a8105a359bda 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -310,8 +310,10 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from history' -a '(__fish_pr # images complete -c docker -f -n '__fish_docker_no_subcommand' -a images -d 'List images' -complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s a -l all -d 'Show all images (by default filter out the intermediate image layers)' -complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s f -l filter -d "Provide filter values (i.e., 'dangling=true')" +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s a -l all -d 'Show all images (default hides intermediate images)' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l digests -d 'Show digests' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s f -l filter -d 'Filter output based on conditions provided' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l format -d 'Pretty-print images using a Go template' complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l help -d 'Print usage' complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l no-trunc -d "Don't truncate output" complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s q -l quiet -d 'Only show numeric IDs' From 202601b774c788f93217b51a067a8de822d7f9bb Mon Sep 17 00:00:00 2001 From: Kyle Spiers Date: Sat, 5 May 2018 01:22:45 -0700 Subject: [PATCH 6/9] update docker Import subcommand completions Signed-off-by: Kyle Spiers --- contrib/completion/fish/docker.fish | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index a8105a359bda..0c1f29aa8853 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -321,6 +321,8 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from images' -a '(__fish_pri # import complete -c docker -f -n '__fish_docker_no_subcommand' -a import -d 'Create a new filesystem image from the contents of a tarball' +complete -c docker -A -f -n '__fish_seen_subcommand_from import' -s c -l change -d 'Apply Dockerfile instruction to the created image' +complete -c docker -A -f -n '__fish_seen_subcommand_from import' -s m -l message -d 'Set commit message for imported image' complete -c docker -A -f -n '__fish_seen_subcommand_from import' -l help -d 'Print usage' # info From 20f269a1ffda1d306ce6245d74b3baf888caaec9 Mon Sep 17 00:00:00 2001 From: Kyle Spiers Date: Sat, 5 May 2018 01:27:43 -0700 Subject: [PATCH 7/9] update docker Inspect subcommand completions Signed-off-by: Kyle Spiers --- contrib/completion/fish/docker.fish | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index 0c1f29aa8853..d2ec7c7aa8e5 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -335,6 +335,7 @@ complete -c docker -f -n '__fish_docker_no_subcommand' -a inspect -d 'Return low complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -s f -l format -d 'Format the output using the given go template.' complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -l help -d 'Print usage' complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -s s -l size -d 'Display total file sizes if the type is container.' +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -l type -d 'Return JSON for specified type' complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -a '(__fish_print_docker_images)' -d "Image" complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -a '(__fish_print_docker_containers all)' -d "Container" From 647d4c983f5e83698acdc486aa013cb2e2ad36e9 Mon Sep 17 00:00:00 2001 From: Kyle Spiers Date: Sat, 5 May 2018 01:33:47 -0700 Subject: [PATCH 8/9] update docker Load subcommand completions Signed-off-by: Kyle Spiers --- contrib/completion/fish/docker.fish | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index d2ec7c7aa8e5..d62b59c6dfed 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -349,6 +349,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from kill' -a '(__fish_print complete -c docker -f -n '__fish_docker_no_subcommand' -a load -d 'Load an image from a tar archive' complete -c docker -A -f -n '__fish_seen_subcommand_from load' -l help -d 'Print usage' complete -c docker -A -f -n '__fish_seen_subcommand_from load' -s i -l input -d 'Read from a tar archive file, instead of STDIN' +complete -c docker -A -f -n '__fish_seen_subcommand_from load' -s q -l quiet -d 'Suppress the load output' # login complete -c docker -f -n '__fish_docker_no_subcommand' -a login -d 'Log in to a Docker registry server' From 4d890fc68660a7e33edfcc3d5ceaef3a0804797c Mon Sep 17 00:00:00 2001 From: Kyle Spiers Date: Sat, 5 May 2018 01:35:48 -0700 Subject: [PATCH 9/9] update docker Login subcommand completions Signed-off-by: Kyle Spiers --- contrib/completion/fish/docker.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index d62b59c6dfed..53c19e9c887d 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -355,7 +355,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from load' -s q -l quiet -d complete -c docker -f -n '__fish_docker_no_subcommand' -a login -d 'Log in to a Docker registry server' complete -c docker -A -f -n '__fish_seen_subcommand_from login' -l help -d 'Print usage' complete -c docker -A -f -n '__fish_seen_subcommand_from login' -s p -l password -d 'Password' -complete -c docker -A -f -n '__fish_seen_subcommand_from login' -l password-stdin -d 'Read password from stdin' +complete -c docker -A -f -n '__fish_seen_subcommand_from login' -l password-stdin -d 'Take the password from stdin' complete -c docker -A -f -n '__fish_seen_subcommand_from login' -s u -l username -d 'Username' # logout