Merge pull request #14074 from sdurrheimer/master

Update the zsh completion

contrib/completion/zsh/_docker

@@ -145,7 +145,7 @@ __docker_search() {
     if ( [[ ${(P)+cachename} -eq 0 ]] || _cache_invalid ${cachename#_} ) \
         && ! _retrieve_cache ${cachename#_}; then
         _message "Searching for ${searchterm}..."
-        result=(${${${(f)"$(_call_program commands docker search ${searchterm})"}%% *}[2,-1]})
+        result=(${${${(f)"$(_call_program commands docker search $searchterm)"}%% *}[2,-1]})
         _store_cache ${cachename#_} result
     fi
     _wanted dockersearch expl 'available images' compadd -a result
@@ -191,33 +191,46 @@ __docker_subcommand () {
     case "$words[1]" in
         (attach)
             _arguments \
+                '(- :)--help[Print usage]' \
                 '--no-stdin[Do not attach stdin]' \
                 '--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]' \
-                ':containers:__docker_runningcontainers'
+                ':containers:__docker_runningcontainers' && ret=0
             ;;
         (build)
             _arguments \
-                {-f,--file=-}'[Dockerfile to use]:Dockerfile:_files' \
+                '(-c --cpu-share)'{-c,--cpu-share=-}'[CPU shares (relative weight)]:CPU shares: ' \
+                '--cgroup-parent=-[Optional parent cgroup for the container]:cgroup parent: ' \
+                '--cpu-period=-[Limit the CPU CFS (Completely Fair Scheduler) period]:CPU period: ' \
+                '--cpu-quota=-[Limit the CPU CFS (Completely Fair Scheduler) quota]:CPU quota: ' \
+                '--cpuset-cpus=-[CPUs in which to allow execution (0-3, 0,1)]:CPUs: ' \
+                '--cpuset-mems=-[MEMs in which to allow execution (0-3, 0,1)]:MEMs: ' \
+                '(-f --file)'{-f,--file=-}"[Name of the Dockerfile (Default is 'PATH/Dockerfile')]:Dockerfile:_files" \
                 '--force-rm[Always remove intermediate containers]' \
+                '(- :)--help[Print usage]' \
+                '(-m --memory)'{-m,--memory=-}'[Memory limit]:Memory limit: ' \
+                '--memory-swap=-[Total memory (memory + swap), '-1' to disable swap]' \
                 '--no-cache[Do not use cache when building the image]' \
-                '--pull[Attempt to pull a newer version of the image]' \
-                {-q,--quiet}'[Suppress verbose build output]' \
+                '--pull[Always attempt to pull a newer version of the image]' \
+                '(-q --quiet)'{-q,--quiet}'[Suppress the verbose output generated by the containers]' \
                 '--rm[Remove intermediate containers after a successful build]' \
-                {-t,--tag=-}'[Repository, name and tag to be applied]:repository:__docker_repositories_with_tags' \
-                ':path or URL:_directories'
+                '(-t --tag)'{-t,--tag=-}'[Repository name (and optionally a tag) for the image]:repository:__docker_repositories_with_tags' \
+                ':path or URL:_directories' && ret=0
             ;;
         (commit)
             _arguments \
-                {-a,--author=-}'[Author]:author: ' \
-                {-m,--message=-}'[Commit message]:message: ' \
-                {-p,--pause}'[Pause container during commit]' \
+                '(-a --author)'{-a,--author=-}'[Author]:author: ' \
+                '*'{-c,--change=-}'[Apply Dockerfile instruction to the created image]' \
+                '(- :)--help[Print usage]' \
+                '(-m --message)'{-m,--message=-}'[Commit message]:message: ' \
+                '(-p --pause)'{-p,--pause}'[Pause container during commit]' \
                 ':container:__docker_containers' \
-                ':repository:__docker_repositories_with_tags'
+                ':repository:__docker_repositories_with_tags' && ret=0
             ;;
         (cp)
             _arguments \
+                '(- :)--help[Print usage]' \
                 ':container:->container' \
-                ':hostpath:_files'
+                ':hostpath:_files' && ret=0
             case $state in
                 (container)
                     if compset -P '*:'; then
@@ -228,21 +241,93 @@ __docker_subcommand () {
                     ;;
             esac
             ;;
-        (diff|export)
-            _arguments '*:containers:__docker_containers'
+        (create)
+            _arguments \
+                '*'{-a,--attach=-}'[Attach to STDIN, STDOUT or STDERR]:STD:(STDIN STDOUT STDERR)' \
+                '*--add-host=-[Add a custom host-to-IP mapping (host:ip)]:host\:ip mapping: ' \
+                '--blkio-weight=-[Block IO (relative weight), between 10 and 1000]:Block IO weight: ' \
+                '(-c --cpu-shares)'{-c,--cpu-shares=-}'[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)' \
+                '*--cap-add=-[Add Linux capabilities]:capability: ' \
+                '*--cap-drop=-[Drop Linux capabilities]:capability: ' \
+                '--cgroup-parent=-[Optional parent cgroup for the container]:cgroup parent: ' \
+                '--cidfile=-[Write the container ID to the file]:CID:_files' \
+                '--cpu-period=-[Limit CPU CFS (Completely Fair Scheduler) period]:CPU period: ' \
+                '--cpu-quota=-[Limit the CPU CFS quota]:CPU quota: ' \
+                '--cpuset-cpus=-[CPUs in which to allow execution (0-3, 0,1)]:CPUs: ' \
+                '--cpuset-mems=-[MEMs in which to allow execution (0-3, 0,1)]:MEMs: ' \
+                '*--device=-[Add a host device to the container]:device:_files' \
+                '*--dns=-[Set custom dns servers]:dns server: ' \
+                '*--dns-search=-[Set custom DNS search domains]:dns domains: ' \
+                '*'{-e,--env=-}'[Set environment variables]:environment variable: ' \
+                '--entrypoint=-[Overwrite the default ENTRYPOINT of the image]:entry point: ' \
+                '*--env-file=-[Read in a file of environment variables]:environment file:_files' \
+                '*--expose=-[Expose a port or a range of ports]:port or a range of ports: ' \
+                '(-h --hostname)'{-h,--hostname=-}'[Container host name]:hostname:_hosts' \
+                '(- :)--help[Print usage]' \
+                '(-i --interactive)'{-i,--interactive}'[Keep STDIN open even if not attached]' \
+                '--ipc=-[IPC namespace to use]:IPC namespace: ' \
+                '*'{-l,--label=-}'[Set meta data on a container]:Label: ' \
+                '*--label-file=-[Read in a line delimited file of labels]' \
+                '*--link=-[Add link to another container]:link:->link' \
+                '--log-driver=-[Logging driver for container]:Logging driver: ' \
+                '*--log-opt=-[Log driver options]:Log driver options: ' \
+                '*--lxc-conf=-[Add custom lxc options]:lxc options: ' \
+                '(-m --memory)'{-m,--memory=-}'[Memory limit (in bytes)]:Memory limit: ' \
+                '--mac-address=-[Container MAC address (e.g. 92:d0:c6:0a:29:33)]:MAC address: ' \
+                "--memory-swap=-[Total memory (memory + swap), '-1' to disable swap]:Total memory: " \
+                '--name=-[Assign a name to the container]:name: ' \
+                '--net=-[Set the Network mode for the container]:network mode:(bridge none container host)' \
+                '--oom-kill-disable[Disable OOM Killer]' \
+                '(-P --publish-all)'{-P,--publish-all}'[Publish all exposed ports to random ports]' \
+                '*'{-p,--publish=-}"[Publish a container's port(s) to the host]:port:_ports" \
+                '--pid=-[PID namespace to use]:PID: ' \
+                '--privileged[Give extended privileges to this container]' \
+                "--read-only[Mount the container's root filesystem as read only]" \
+                '--restart=-[Restart policy]:restart policy:(no on-failure always)' \
+                '--rm[Remove intermediate containers when it exits]' \
+                '*--security-opt=-[Security options]:security option: ' \
+                '(-t --tty)'{-t,--tty}'[Allocate a pseudo-TTY]' \
+                '(-u --user)'{-u,--user=-}'[Username or UID]:user:_users' \
+                '*--ulimit=-[Ulimit options]:ulimit: ' \
+                '--uts=-[UTS namespace to use]:UTS: ' \
+                '*'{-v,--volume=-}'[Bind mount a volume]:volume: ' \
+                '*--volumes-from=-[Mount volumes from the specified container]:volume: ' \
+                '(-w --workdir)'{-w,--workdir=-}'[Working directory inside the container]:directory:_directories' \
+                '(-):images:__docker_images' \
+                '(-):command: _command_names -e' \
+                '*::arguments: _normal' && ret=0
+
+            case $state in
+                (link)
+                    if compset -P '*:'; then
+                        _wanted alias expl 'Alias' compadd -E ""
+                    else
+                        __docker_runningcontainers -qS ":"
+                    fi
+                    ;;
+            esac
+
+            ;;
+        (diff)
+            _arguments \
+                '(- :)--help[Print usage]' \
+                '*:containers:__docker_containers' && ret=0
             ;;
         (events)
             _arguments \
-                '*'{-f,--filter=-}'[Filter values]:filter: ' \
-                '--since=-[Events created since this timestamp]:timestamp: ' \
-                '--until=-[Events created until this timestamp]:timestamp: '
+                '*'{-f,--filter=-}'[Filter output based on conditions provided]:filter: ' \
+                '(- :)--help[Print usage]' \
+                '--since=-[Show all events created since timestamp]:timestamp: ' \
+                '--until=-[Stream events until this timestamp]:timestamp: ' && ret=0
             ;;
         (exec)
-            local state ret
+            local state
             _arguments \
-                {-d,--detach}'[Detached mode: leave the container running in the background]' \
-                {-i,--interactive}'[Keep stdin open even if not attached]' \
-                {-t,--tty}'[Allocate a pseudo-tty]' \
+                '(-d --detach)'{-d,--detach}'[Detached mode: run command in the background]' \
+                '(- :)--help[Print usage]' \
+                '(-i --interactive)'{-i,--interactive}'[Keep STDIN open even if not attached]' \
+                '(-t --tty)'{-t,--tty}'[Allocate a pseudo-TTY]' \
+                '(-u --user)'{-u,--user=-}'[Username or UID]:User: ' \
                 ':containers:__docker_runningcontainers' \
                 '*::command:->anycommand' && ret=0
 
@@ -256,166 +341,199 @@ __docker_subcommand () {
 
             return ret
             ;;
+        (export)
+            _arguments \
+                '(- :)--help[Print usage]' \
+                '(-o --output)'{-o,--output=-}'[Write to a file, instead of STDOUT]:file: ' \
+                '*:containers:__docker_containers' && ret=0
+            ;;
         (history)
             _arguments \
+                '(-H --human)'{-H,--human}'[Print sizes and dates in human readable format]' \
+                '(- :)--help[Print usage]' \
                 '--no-trunc[Do not truncate output]' \
-                {-q,--quiet}'[Only show numeric IDs]' \
-                '*:images:__docker_images'
+                '(-q --quiet)'{-q,--quiet}'[Only show numeric IDs]' \
+                '*:images:__docker_images' && ret=0
             ;;
         (images)
             _arguments \
-                {-a,--all}'[Show all images]' \
-                '*'{-f,--filter=-}'[Filter values]:filter: ' \
+                '(-a --all)'{-a,--all}'[Show all images (default hides intermediate images)]' \
+                '--digests[Show digests]' \
+                '*'{-f,--filter=-}'[Filter output based on conditions provided]:filter: ' \
+                '(- :)--help[Print usage]' \
                 '--no-trunc[Do not truncate output]' \
-                {-q,--quiet}'[Only show numeric IDs]' \
-                ':repository:__docker_repositories'
+                '(-q --quiet)'{-q,--quiet}'[Only show numeric IDs]' \
+                ':repository:__docker_repositories' && ret=0
             ;;
         (import)
             _arguments \
-                ':URL:(- http:// file://)' \
-                ':repository:__docker_repositories_with_tags'
+                '*'{-c,--change=-}'[Apply Dockerfile instruction to the created image]' \
+                '(- :)--help[Print usage]' \
+                ':URL:(http:// file://)' \
+                ':repository:__docker_repositories_with_tags' && ret=0
             ;;
-        (info)
+        (info|version)
+            _arguments \
+                '(- :)--help[Print usage]' && ret=0
             ;;
         (inspect)
             _arguments \
-                {-f,--format=-}'[Format the output using the given go template]:template: ' \
-                '*:containers:__docker_containers'
+                '(-f --format)'{-f,--format=-}'[Format the output using the given go template]:template: ' \
+                '(- :)--help[Print usage]' \
+                '*:containers:__docker_containers' && ret=0
             ;;
         (kill)
             _arguments \
-                {-s,--signal=-}'[Signal to send]:signal:_signals' \
-                '*:containers:__docker_runningcontainers'
+                '(- :)--help[Print usage]' \
+                '(-s --signal)'{-s,--signal=-}'[Signal to send to the container]:signal:_signals' \
+                '*:containers:__docker_runningcontainers' && ret=0
             ;;
         (load)
             _arguments \
-                {-i,--input=-}'[Read from tar archive file]:archive file:_files -g "*.((tar|TAR)(.gz|.GZ|.Z|.bz2|.lzma|.xz|)|(tbz|tgz|txz))(-.)"'
+                '(- :)--help[Print usage]' \
+                '(-i --input)'{-i,--input=-}'[Read from a tar archive file, instead of STDIN]:archive file:_files -g "*.((tar|TAR)(.gz|.GZ|.Z|.bz2|.lzma|.xz|)|(tbz|tgz|txz))(-.)"' && ret=0
             ;;
         (login)
             _arguments \
-                {-e,--email=-}'[Email]:email: ' \
-                {-p,--password=-}'[Password]:password: ' \
-                {-u,--user=-}'[Username]:username: ' \
-                ':server: '
+                '(-e --email)'{-e,--email=-}'[Email]:email: ' \
+                '(- :)--help[Print usage]' \
+                '(-p --password)'{-p,--password=-}'[Password]:password: ' \
+                '(-u --user)'{-u,--user=-}'[Username]:username: ' \
+                '1:server:->string' && ret=0
             ;;
         (logout)
             _arguments \
-                ':server: '
+                '(- :)--help[Print usage]' \
+                '1:server:->string' && ret=0
             ;;
         (logs)
             _arguments \
-                {-f,--follow}'[Follow log output]' \
-                '-s,--since[Show logs since timestamp]' \
-                {-t,--timestamps}'[Show timestamps]' \
-                '--tail=-[Output the last K lines]:lines:(1 10 20 50 all)' \
-                '*:containers:__docker_containers'
-            ;;
-        (port)
-            _arguments \
-                '1:containers:__docker_runningcontainers' \
-                '2:port:_ports'
+                '(-f --follow)'{-f,--follow}'[Follow log output]' \
+                '(- :)--help[Print usage]' \
+                '--since=-[Show logs since timestamp]:timestamp: ' \
+                '(-t --timestamps)'{-t,--timestamps}'[Show timestamps]' \
+                '--tail=-[Number of lines to show from the end of the logs]:lines:(1 10 20 50 all)' \
+                '*:containers:__docker_containers' && ret=0
             ;;
         (pause|unpause)
             _arguments \
-                '1:containers:__docker_runningcontainers'
+                '(- :)--help[Print usage]' \
+                '1:containers:__docker_runningcontainers' && ret=0
             ;;
-        (start)
+        (port)
             _arguments \
-                {-a,--attach}'[Attach container'"'"'s stdout/stderr and forward all signals]' \
-                {-i,--interactive}'[Attach container'"'"'s stding]' \
-                '*:containers:__docker_stoppedcontainers'
+                '(- :)--help[Print usage]' \
+                '1:containers:__docker_runningcontainers' \
+                '2:port:_ports' && ret=0
             ;;
-        (stats)
+        (ps)
             _arguments \
-                '--no-stream[Disable streaming stats and only pull the first result]' \
-                '*:containers:__docker_runningcontainers'
+                '(-a --all)'{-a,--all}'[how all containers (default shows just running)]' \
+                '--before=-[Show only container created before Id or Name]:containers:__docker_containers' \
+                '*'{-f,--filter=-}'[Filter output based on conditions provided]:filter: ' \
+                '(- :)--help[Print usage]' \
+                '(-l --latest)'{-l,--latest}'[Show the latest created container, include non-running]' \
+                '-n[Show n last created containers, include non-running]:n:(1 5 10 25 50)' \
+                '--no-trunc[Do not truncate output]' \
+                '(-q --quiet)'{-q,--quiet}'[Only show numeric IDs]' \
+                '(-s --size)'{-s,--size}'[Display total file sizes]' \
+                '--since=-[Show created since Id or Name, include non-running]:containers:__docker_containers' && ret=0
             ;;
-        (rm)
+        (pull)
             _arguments \
-                {-f,--force}'[Force removal]' \
-                {-l,--link}'[Remove the specified link and not the underlying container]' \
-                {-v,--volumes}'[Remove the volumes associated to the container]' \
-                '*:containers:__docker_stoppedcontainers'
+                '(-a --all-tags)'{-a,--all-tags}'[Download all tagged images in the repository]' \
+                '(- :)--help[Print usage]' \
+                ':name:__docker_search' && ret=0
             ;;
-        (rmi)
+        (push)
             _arguments \
-                {-f,--force}'[Force removal]' \
-                '--no-prune[Do not delete untagged parents]' \
-                '*:images:__docker_images'
+                '(- :)--help[Print usage]' \
+                ':images:__docker_images' && ret=0
             ;;
-        (restart|stop)
+        (rename)
             _arguments \
-                {-t,--time=-}'[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)' \
-                '*:containers:__docker_runningcontainers'
+                '(- :)--help[Print usage]' \
+                ':old name:__docker_containers' \
+                ':new name: ' && ret=0
             ;;
-        (top)
+        (restart|stop)
             _arguments \
-                '1:containers:__docker_runningcontainers' \
-                '(-)*:: :->ps-arguments'
-            case $state in
-                (ps-arguments)
-                    _ps
-                    ;;
-            esac
-
+                '(- :)--help[Print usage]' \
+                '(-t --time)'{-t,--time=-}'[Seconds to wait for stop before killing the container]:seconds to before killing:(1 5 10 30 60)' \
+                '*:containers:__docker_runningcontainers' && ret=0
             ;;
-        (ps)
+        (rm)
             _arguments \
-                {-a,--all}'[Show all containers]' \
-                '--before=-[Show only container created before...]:containers:__docker_containers' \
-                '*'{-f,--filter=-}'[Filter values]:filter: ' \
-                {-l,--latest}'[Show only the latest created container]' \
-                '-n[Show n last created containers, include non-running one]:n:(1 5 10 25 50)' \
-                '--no-trunc[Do not truncate output]' \
-                {-q,--quiet}'[Only show numeric IDs]' \
-                {-s,--size}'[Display total file sizes]' \
-                '--since=-[Show only containers created since...]:containers:__docker_containers'
+                '(-f --force)'{-f,--force}'[Force the removal of a running container (uses SIGKILL)]' \
+                '(- :)--help[Print usage]' \
+                '(-l --link)'{-l,--link}'[Remove the specified link and not the underlying container]' \
+                '(-v --volumes)'{-v,--volumes}'[Remove the volumes associated to the container]' \
+                '*:containers:__docker_stoppedcontainers' && ret=0
             ;;
-        (tag)
+        (rmi)
             _arguments \
-                {-f,--force}'[force]'\
-                ':image:__docker_images'\
-                ':repository:__docker_repositories_with_tags'
+                '(-f --force)'{-f,--force}'[Force removal of the image]' \
+                '(- :)--help[Print usage]' \
+                '--no-prune[Do not delete untagged parents]' \
+                '*:images:__docker_images' && ret=0
             ;;
-        (create|run)
+        (run)
             _arguments \
-                {-a,--attach}'[Attach to stdin, stdout or stderr]' \
-                '*--add-host=-[Add a custom host-to-IP mapping]:host\:ip mapping: ' \
-                {-c,--cpu-shares=-}'[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)' \
+                '*'{-a,--attach=-}'[Attach to STDIN, STDOUT or STDERR]:STD:(STDIN STDOUT STDERR)' \
+                '*--add-host=-[Add a custom host-to-IP mapping (host\:ip)]:host\:ip mapping: ' \
+                '--blkio-weight=-[Block IO (relative weight), between 10 and 1000]:Block IO weight: ' \
+                '(-c --cpu-shares)'{-c,--cpu-shares=-}'[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)' \
                 '*--cap-add=-[Add Linux capabilities]:capability: ' \
                 '*--cap-drop=-[Drop Linux capabilities]:capability: ' \
+                '--cgroup-parent=-[Optional parent cgroup for the container]:cgroup parent: ' \
                 '--cidfile=-[Write the container ID to the file]:CID file:_files' \
-                '--cpuset=-[CPUs in which to allow execution]:CPU set: ' \
-                {-d,--detach}'[Detached mode: leave the container running in the background]' \
+                '--cpu-period=-[Limit CPU CFS (Completely Fair Scheduler) period]:CPU period: ' \
+                '--cpu-quota=-[Limit the CPU CFS quota]:CPU quota: ' \
+                '--cpuset-cpus=-[CPUs in which to allow execution (0-3, 0,1)]:CPUs: ' \
+                '--cpuset-mems=-[MEMs in which to allow execution (0-3, 0,1)]:MEMs: ' \
+                '(-d --detach)'{-d,--detach}'[Run container in background and print container ID]' \
                 '*--device=-[Add a host device to the container]:device:_files' \
                 '*--dns=-[Set custom dns servers]:dns server: ' \
                 '*--dns-search=-[Set custom DNS search domains]:dns domains: ' \
-                '*'{-e,--environment=-}'[Set environment variables]:environment variable: ' \
-                '--entrypoint=-[Overwrite the default entrypoint of the image]:entry point: ' \
-                '*--env-file=-[Read environment variables from a file]:environment file:_files' \
-                '*--expose=-[Expose a port from the container without publishing it]: ' \
-                {-h,--hostname=-}'[Container host name]:hostname:_hosts' \
-                {-i,--interactive}'[Keep stdin open even if not attached]' \
+                '*'{-e,--env=-}'[Set environment variables]:environment variable: ' \
+                '--entrypoint=-[Overwrite the default ENTRYPOINT of the image]:entry point: ' \
+                '*--env-file=-[Read in a file of environment variables]:environment file:_files' \
+                '*--expose=-[Expose a port or a range of ports]:port or a range of ports: ' \
+                '(-h --hostname)'{-h,--hostname=-}'[Container host name]:hostname:_hosts' \
+                '(- :)--help[Print usage]' \
+                '(-i --interactive)'{-i,--interactive}'[Keep STDIN open even if not attached]' \
+                '--ipc=-[IPC namespace to use]:IPC: ' \
+                '*'{-l,--label=-}'[Set meta data on a container]:Label: ' \
+                '*--label-file=-[Read in a line delimited file of labels]' \
                 '*--link=-[Add link to another container]:link:->link' \
+                '--log-driver=-[Logging driver for container]:Logging driver: ' \
+                '*--log-opt=-[Log driver options]:Log driver options: ' \
                 '*--lxc-conf=-[Add custom lxc options]:lxc options: ' \
-                '-m[Memory limit (in bytes)]:limit: ' \
-                '--name=-[Container name]:name: ' \
-                '--net=-[Network mode]:network mode:(bridge none container host)' \
-                {-P,--publish-all}'[Publish all exposed ports]' \
-                '*'{-p,--publish=-}'[Expose a container'"'"'s port to the host]:port:_ports' \
+                '(-m --memory)'{-m,--memory=-}'[Memory limit (in bytes)]:Memory limit: ' \
+                '--mac-address=-[Container MAC address (e.g. 92:d0:c6:0a:29:33)]:MAC address: ' \
+                "--memory-swap=-[Total memory (memory + swap), '-1' to disable swap]:Total memory: " \
+                '--name=-[Assign a name to the container]:name: ' \
+                '--net=-[Set the Network mode for the container]:network mode:(bridge none container host)' \
+                '--oom-kill-disable[Disable OOM Killer]' \
+                '(-P --publish-all)'{-P,--publish-all}'[Publish all exposed ports to random ports]' \
+                '*'{-p,--publish=-}"[Publish a container's port(s) to the host]:port:_ports" \
+                '--pid=-[PID namespace to use]:PID: ' \
                 '--privileged[Give extended privileges to this container]' \
+                "--read-only[Mount the container's root filesystem as read only]" \
                 '--restart=-[Restart policy]:restart policy:(no on-failure always)' \
                 '--rm[Remove intermediate containers when it exits]' \
                 '*--security-opt=-[Security options]:security option: ' \
                 '--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]' \
-                {-t,--tty}'[Allocate a pseudo-tty]' \
-                {-u,--user=-}'[Username or UID]:user:_users' \
-                '*-v[Bind mount a volume]:volume: '\
+                '(-t --tty)'{-t,--tty}'[Allocate a pseudo-TTY]' \
+                '(-u --user)'{-u,--user=-}'[Username or UID]:user:_users' \
+                '*--ulimit=-[Ulimit options]:ulimit: ' \
+                '--uts=-[UTS namespace to use]:UTS: ' \
+                '*'{-v,--volume=-}'[Bind mount a volume]:volume: ' \
                 '*--volumes-from=-[Mount volumes from the specified container]:volume: ' \
-                {-w,--workdir=-}'[Working directory inside the container]:directory:_directories' \
+                '(-w --workdir)'{-w,--workdir=-}'[Working directory inside the container]:directory:_directories' \
                 '(-):images:__docker_images' \
                 '(-):command: _command_names -e' \
-                '*::arguments: _normal'
+                '*::arguments: _normal' && ret=0
 
             case $state in
                 (link)
@@ -428,36 +546,59 @@ __docker_subcommand () {
             esac
 
             ;;
-        (pull)
+        (save)
             _arguments \
-                {-a,--all-tags}'[Download all tagged images]' \
-                ':name:__docker_search'
+                '(- :)--help[Print usage]' \
+                '(-o --output)'{-o,--output=-}'[Write to file]:file: ' \
+                '*:images:__docker_images' && ret=0
             ;;
-        (push)
-            _arguments ':images:__docker_images'
+        (search)
+            _arguments \
+                '--automated[Only show automated builds]' \
+                '(- :)--help[Print usage]' \
+                '--no-trunc[Do not truncate output]' \
+                '(-s --stars)'{-s,--stars=-}'[Only display with at least X stars]:stars:(0 10 100 1000)' \
+                '1:term:->string' && ret=0
             ;;
-        (rename)
+        (start)
             _arguments \
-                ':old name:__docker_containers' \
-                ':new name: '
+                '(-a --attach)'{-a,--attach}'[Attach STDOUT/STDERR and forward signals]' \
+                '(- :)--help[Print usage]' \
+                '(-i --interactive)'{-i,--interactive}"[Attach container's STDIN]" \
+                '*:containers:__docker_stoppedcontainers' && ret=0
             ;;
-        (save)
+        (stats)
             _arguments \
-                {-o,--output=-}'[Write to file]:file:_files' \
-                '*:images:__docker_images'
+                '(- :)--help[Print usage]' \
+                '--no-stream[Disable streaming stats and only pull the first result]' \
+                '*:containers:__docker_runningcontainers' && ret=0
             ;;
-        (search)
+        (tag)
             _arguments \
-                '--automated[Only show automated builds]' \
-                '--no-trunc[Do not truncate output]' \
-                {-s,--stars=-}'[Only display with at least X stars]:stars:(0 10 100 1000)' \
-                ':term: '
+                '(-f --force)'{-f,--force}'[force]'\
+                '(- :)--help[Print usage]' \
+                ':image:__docker_images'\
+                ':repository:__docker_repositories_with_tags' && ret=0
+            ;;
+        (top)
+            _arguments \
+                '(- :)--help[Print usage]' \
+                '1:containers:__docker_runningcontainers' \
+                '(-)*:: :->ps-arguments' && ret=0
+            case $state in
+                (ps-arguments)
+                    _ps
+                    ;;
+            esac
+
             ;;
         (wait)
-            _arguments '*:containers:__docker_runningcontainers'
+            _arguments \
+                '(- :)--help[Print usage]' \
+                '*:containers:__docker_runningcontainers' && ret=0
             ;;
         (help)
-            _arguments ':subcommand:__docker_commands'
+            _arguments ':subcommand:__docker_commands' && ret=0
             ;;
         (*)
             _message 'Unknown sub command'
@@ -473,26 +614,70 @@ _docker () {
         return
     fi
 
-    local curcontext="$curcontext" state line
+    local curcontext="$curcontext" state line ret=1
     typeset -A opt_args
 
     _arguments -C \
-      '-H[tcp://host:port to bind/connect to]:socket: ' \
-         '(-): :->command' \
-         '(-)*:: :->option-or-argument'
+        '--api-cors-header=-[Set CORS headers in the remote API]:CORS headers: ' \
+        '(-b --bridge)'{-b,--bridge=-}'[Attach containers to a network bridge]:bridge: ' \
+        '--bip=-[Specify network bridge IP]' \
+        '(-D --debug)'{-D,--debug}'[Enable debug mode]' \
+        '(-d --daeamon)'{-d,--daemon}'[Enable daemon mode]' \
+        '--default-gateway[Container default gateway IPv4 address]:IPv4 address: ' \
+        '--default-gateway-v6[Container default gateway IPv6 address]:IPv6 address: ' \
+        '*--dns=-[DNS server to use]:DNS: ' \
+        '*--dns-search=-[DNS search domains to use]' \
+        '*--default-ulimit=-[Set default ulimit settings for containers]:ulimit: ' \
+        '(-e --exec-driver)'{-e,--exec-driver=-}'[Exec driver to use]:driver:(native lxc Windows)' \
+        '*--exec-opt=-[Set exec driver options]:exec driver options: ' \
+        '--exec-root=-[Root of the Docker execdriver (default: /var/run/docker)]:PATH:_directories' \
+        '--fixed-cidr=-[IPv4 subnet for fixed IPs]:IPv4 subnet: ' \
+        '--fixed-cidr-v6=-[IPv6 subnet for fixed IPs]:IPv6 subnet: ' \
+        '(-G --group)'{-G,--group=-}'[Group for the unix socket (default: docker)]:group:_groups' \
+        '(-g --graph)'{-g,--graph=-}'[Root of the Docker runtime (default: /var/lib/docker)]:PATH:_directories' \
+        '(-H --host)'{-H,--host=-}'[tcp://host:port to bind/connect to]:socket: ' \
+        '(-h --help)'{-h,--help}'[Print usage]' \
+        '--icc[Enable inter-container communication]' \
+        '*--insecure-registry=-[Enable insecure registry communication]:registry: ' \
+        '--ip=-[Default IP when binding container ports (default: 0.0.0.0)]' \
+        '--ip-forward=-[Enable net.ipv4.ip_forward]:enable:(true false)' \
+        '--ip-masq=-[Enable IP masquerading]:enable:(true false)' \
+        '--iptables=-[Enable addition of iptables rules]:enable:(true false)' \
+        '--ipv6[Enable IPv6 networking]' \
+        '(-l --log-level)'{-l,--log-level=-}'[Set the logging level]:level:(debug info warn error fatal)' \
+        '*--label=-[Set key=value labels to the daemon]:label: ' \
+        '--log-driver=-[Default driver for container logs (default: json-file)]:driver:(json-file syslog journald gelf none)' \
+        '*--log-opt=-[Log driver specific options]:log driver options: ' \
+        '--mtu=-[Set the containers network MTU (default: 0)]' \
+        '(-p --pidfile)'{-p,--pidfile=-}'[Path to use for daemon PID file (default: /var/run/docker.pid)]:PID file PATH: ' \
+        '*--registry-mirror=-[Preferred Docker registry mirror]:registry mirror: ' \
+        '(-s --storage-driver)'{-s,--storage-driver=-}'[Storage driver to use]:driver:(aufs devicemapper btrfs zfs overlay)' \
+        '--selinux-enabled[Enable selinux support]' \
+        '*--storage-opt=-[Set storage driver options]:storage driver options: ' \
+        '--tls[Use TLS; implied by --tlsverify]' \
+        '--tlscacert=-[Trust certs signed only by this CA (default: ~/.docker/ca.pem)]' \
+        '--tlscert=-[Path to TLS certificate file (default: ~/.docker/cert.pem)]' \
+        '--tlskey=-[Path to TLS key file (default: ~/.docker/key.pem)]' \
+        '--tlsverify[Use TLS and verify the remote]' \
+        '--userland-proxy=-[Use userland proxy for loopback traffic]:enable:(true false)' \
+        '(-v --version)'{-v,--version}'[Print version information and quit]' \
+        '(-): :->command' \
+        '(-)*:: :->option-or-argument' && ret=0
 
     if (( CURRENT == 1 )); then
 
     fi
     case $state in
         (command)
-            __docker_commands
+            __docker_commands && ret=0
             ;;
         (option-or-argument)
             curcontext=${curcontext%:*:*}:docker-$words[1]:
-            __docker_subcommand
+            __docker_subcommand && ret=0
             ;;
     esac
+
+    return ret
 }
 
 _docker "$@"