Diff
1diff --git a/plugins/docker/README.md b/plugins/docker/README.md
2index 606690f14e0d82f7015d34da7f07d6e01c0d89c6..b865d53ed511cbd4b5b643c2fcde372168717abf 100644
3--- a/plugins/docker/README.md
4+++ b/plugins/docker/README.md
5@@ -13,18 +13,15 @@ https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker
6
7 ## Settings
8
9-By default, the completion doesn't allow option-stacking, meaning if you try to
10-complete `docker run -it <TAB>` it won't work, because you're _stacking_ the
11-`-i` and `-t` options.
12+By default, the completion doesn't allow option-stacking, meaning if you try to complete
13+`docker run -it <TAB>` it won't work, because you're _stacking_ the `-i` and `-t` options.
14
15-[You can enable it](https://github.com/docker/cli/commit/b10fb43048) by **adding
16-the lines below to your zshrc file**, but be aware of the side effects:
17+[You can enable it](https://github.com/docker/cli/commit/b10fb43048) by **adding the lines below to your zshrc
18+file**, but be aware of the side effects:
19
20-> This enables Zsh to understand commands like `docker run -it
21-> ubuntu`. However, by enabling this, this also makes Zsh complete
22-> `docker run -u<tab>` with `docker run -uapprox` which is not valid. The
23-> users have to put the space or the equal sign themselves before trying
24-> to complete.
25+> This enables Zsh to understand commands like `docker run -it ubuntu`. However, by enabling this, this also
26+> makes Zsh complete `docker run -u<tab>` with `docker run -uapprox` which is not valid. The users have to put
27+> the space or the equal sign themselves before trying to complete.
28 >
29 > Therefore, this behavior is disabled by default. To enable it:
30 >
31@@ -35,39 +32,36 @@ the lines below to your zshrc file**, but be aware of the side effects:
32
33 ## Aliases
34
35-| Alias | Command | Description |
36-| :------ | :-------------------------- | :--------------------------------------------------------------------------------------- |
37-| dbl | `docker build` | Build an image from a Dockerfile |
38-| dcin | `docker container inspect` | Display detailed information on one or more containers |
39-| dlo | `docker container logs` | Fetch the logs of a docker container |
40-| dcls | `docker container ls` | List all the running docker containers |
41-| dclsa | `docker container ls -a` | List all running and stopped containers |
42-| dpo | `docker container port` | List port mappings or a specific mapping for the container |
43-| dpu | `docker pull` | Pull an image or a repository from a registry |
44-| dr | `docker container run` | Create a new container and start it using the specified command |
45-| drit | `docker container run -it` | Create a new container and start it in an interactive shell |
46-| drm | `docker container rm` | Remove the specified container(s) |
47-| drm! | `docker container rm -f` | Force the removal of a running container (uses SIGKILL) |
48-| dst | `docker container start` | Start one or more stopped containers |
49-| dstp | `docker container stop` | Stop one or more running containers |
50-| dtop | `docker top` | Display the running processes of a container |
51-| dxc | `docker container exec` | Run a new command in a running container |
52-| dxcit | `docker container exec -it` | Run a new command in a running container in an interactive shell |
53-| | | **Docker Images** |
54-| dib | `docker image build` | Build an image from a Dockerfile (same as docker build) |
55-| dii | `docker image inspect` | Display detailed information on one or more images |
56-| dils | `docker image ls` | List docker images |
57-| dipu | `docker image push` | Push an image or repository to a remote registry |
58-| dirm | `docker image rm` | Remove one or more images |
59-| dit | `docker image tag` | Add a name and tag to a particular image |
60-| | | **Docker Network** |
61-| dnc | `docker network create` | Create a new network |
62-| dncn | `docker network connect` | Connect a container to a network |
63-| dndcn | `docker network disconnect` | Disconnect a container from a network |
64-| dni | `docker network inspect` | Return information about one or more networks |
65-| dnls | `docker network ls` | List all networks the engine daemon knows about, including those spanning multiple hosts |
66-| dnrm | `docker network rm` | Remove one or more networks |
67-| | | **Docker Volume** |
68-| dvi | `docker volume inspect` | Display detailed information about one or more volumes |
69-| dvls | `docker volume ls` | List all the volumes known to docker |
70-| dvprune | `docker volume prune` | Cleanup dangling volumes |
71+| Alias | Command | Description |
72+| :------ | :---------------------------- | :--------------------------------------------------------------------------------------- |
73+| dbl | `docker build` | Build an image from a Dockerfile |
74+| dcin | `docker container inspect` | Display detailed information on one or more containers |
75+| dcls | `docker container ls` | List all the running docker containers |
76+| dclsa | `docker container ls -a` | List all running and stopped containers |
77+| dib | `docker image build` | Build an image from a Dockerfile (same as docker build) |
78+| dii | `docker image inspect` | Display detailed information on one or more images |
79+| dils | `docker image ls` | List docker images |
80+| dipu | `docker image push` | Push an image or repository to a remote registry |
81+| dirm | `docker image rm` | Remove one or more images |
82+| dit | `docker image tag` | Add a name and tag to a particular image |
83+| dlo | `docker container logs` | Fetch the logs of a docker container |
84+| dnc | `docker network create` | Create a new network |
85+| dncn | `docker network connect` | Connect a container to a network |
86+| dndcn | `docker network disconnect` | Disconnect a container from a network |
87+| dni | `docker network inspect` | Return information about one or more networks |
88+| dnls | `docker network ls` | List all networks the engine daemon knows about, including those spanning multiple hosts |
89+| dnrm | `docker network rm` | Remove one or more networks |
90+| dpo | `docker container port` | List port mappings or a specific mapping for the container |
91+| dpu | `docker pull` | Pull an image or a repository from a registry |
92+| dr | `docker container run` | Create a new container and start it using the specified command |
93+| drit | `docker container run -it` | Create a new container and start it in an interactive shell |
94+| drm | `docker container rm` | Remove the specified container(s) |
95+| drm! | `docker container rm -f` | Force the removal of a running container (uses SIGKILL) |
96+| dst | `docker container start` | Start one or more stopped containers |
97+| dstp | `docker container stop` | Stop one or more running containers |
98+| dtop | `docker top` | Display the running processes of a container |
99+| dvi | `docker volume inspect` | Display detailed information about one or more volumes |
100+| dvls | `docker volume ls` | List all the volumes known to docker |
101+| dvprune | `docker volume prune` | Cleanup dangling volumes |
102+| dxc | `docker container exec` | Run a new command in a running container |
103+| dxcit | `docker container exec -it` | Run a new command in a running container in an interactive shell |
104diff --git a/plugins/docker/docker.plugin.zsh b/plugins/docker/docker.plugin.zsh
105index 9c8ad8a288077038f501be8f16513a8532798d85..483b3b97e78fda035327d99543e1c8ee412b51c5 100644
106--- a/plugins/docker/docker.plugin.zsh
107+++ b/plugins/docker/docker.plugin.zsh
108@@ -1,39 +1,31 @@
109 alias dbl='docker build'
110-alias dpu='docker pull'
111-alias dtop='docker top'
112-
113-# docker containers
114 alias dcin='docker container inspect'
115-alias dlo='docker container logs'
116 alias dcls='docker container ls'
117 alias dclsa='docker container ls -a'
118-alias dpo='docker container port'
119-alias dr='docker container run'
120-alias drit='docker container run -it'
121-alias drm='docker container rm'
122-alias 'drm!'='docker container rm -f'
123-alias dst='docker container start'
124-alias dstp='docker container stop'
125-alias dxc='docker container exec'
126-alias dxcit='docker container exec -it'
127-
128-# docker images
129 alias dib='docker image build'
130 alias dii='docker image inspect'
131 alias dils='docker image ls'
132 alias dipu='docker image push'
133 alias dirm='docker image rm'
134 alias dit='docker image tag'
135-
136-# docker network
137+alias dlo='docker container logs'
138 alias dnc='docker network create'
139 alias dncn='docker network connect'
140 alias dndcn='docker network disconnect'
141 alias dni='docker network inspect'
142 alias dnls='docker network ls'
143 alias dnrm='docker network rm'
144-
145-# docker volume
146+alias dpo='docker container port'
147+alias dpu='docker pull'
148+alias dr='docker container run'
149+alias drit='docker container run -it'
150+alias drm='docker container rm'
151+alias 'drm!'='docker container rm -f'
152+alias dst='docker container start'
153+alias dstp='docker container stop'
154+alias dtop='docker top'
155 alias dvi='docker volume inspect'
156 alias dvls='docker volume ls'
157 alias dvprune='docker volume prune'
158+alias dxc='docker container exec'
159+alias dxcit='docker container exec -it'