From 1c06ea24fb2176e28facf34b7c2ed2bfb3c79eaa Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 15 Nov 2022 20:05:13 +0100
Subject: [PATCH] chore(docker): sort and reorganize aliases

---
 plugins/docker/README.md         | 86 +++++++++++++++-----------------
 plugins/docker/docker.plugin.zsh | 32 +++++-------
 2 files changed, 52 insertions(+), 66 deletions(-)

diff --git a/plugins/docker/README.md b/plugins/docker/README.md
index 606690f14..b865d53ed 100644
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@@ -13,18 +13,15 @@ https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker
 
 ## Settings
 
-By default, the completion doesn't allow option-stacking, meaning if you try to
-complete `docker run -it <TAB>` it won't work, because you're _stacking_ the
-`-i` and `-t` options.
+By default, the completion doesn't allow option-stacking, meaning if you try to complete
+`docker run -it <TAB>` it won't work, because you're _stacking_ the `-i` and `-t` options.
 
-[You can enable it](https://github.com/docker/cli/commit/b10fb43048) by **adding
-the lines below to your zshrc file**, but be aware of the side effects:
+[You can enable it](https://github.com/docker/cli/commit/b10fb43048) by **adding the lines below to your zshrc
+file**, but be aware of the side effects:
 
-> This enables Zsh to understand commands like `docker run -it
-> ubuntu`. However, by enabling this, this also makes Zsh complete
-> `docker run -u<tab>` with `docker run -uapprox` which is not valid. The
-> users have to put the space or the equal sign themselves before trying
-> to complete.
+> This enables Zsh to understand commands like `docker run -it ubuntu`. However, by enabling this, this also
+> makes Zsh complete `docker run -u<tab>` with `docker run -uapprox` which is not valid. The users have to put
+> the space or the equal sign themselves before trying to complete.
 >
 > Therefore, this behavior is disabled by default. To enable it:
 >
@@ -35,39 +32,36 @@ the lines below to your zshrc file**, but be aware of the side effects:
 
 ## Aliases
 
-| Alias   | Command                     | Description                                                                              |
-| :------ | :-------------------------- | :--------------------------------------------------------------------------------------- |
-| dbl     | `docker build`              | Build an image from a Dockerfile                                                         |
-| dcin    | `docker container inspect`  | Display detailed information on one or more containers                                   |
-| dlo     | `docker container logs`     | Fetch the logs of a docker container                                                     |
-| dcls     | `docker container ls`       | List all the running docker containers                                                   |
-| dclsa    | `docker container ls -a`    | List all running and stopped containers                                                  |
-| dpo     | `docker container port`     | List port mappings or a specific mapping for the container                               |
-| dpu     | `docker pull`               | Pull an image or a repository from a registry                                            |
-| dr      | `docker container run`      | Create a new container and start it using the specified command                          |
-| drit    | `docker container run -it`  | Create a new container and start it in an interactive shell                              |
-| drm     | `docker container rm`       | Remove the specified container(s)                                                        |
-| drm!    | `docker container rm -f`    | Force the removal of a running container (uses SIGKILL)                                  |
-| dst     | `docker container start`    | Start one or more stopped containers                                                     |
-| dstp    | `docker container stop`     | Stop one or more running containers                                                      |
-| dtop    | `docker top`                | Display the running processes of a container                                             |
-| dxc     | `docker container exec`     | Run a new command in a running container                                                 |
-| dxcit   | `docker container exec -it` | Run a new command in a running container in an interactive shell                         |
-|         |                             | **Docker Images**                                                                        |
-| dib     | `docker image build`        | Build an image from a Dockerfile (same as docker build)                                  |
-| dii     | `docker image inspect`      | Display detailed information on one or more images                                       |
-| dils    | `docker image ls`           | List docker images                                                                       |
-| dipu     | `docker image push`         | Push an image or repository to a remote registry                                         |
-| dirm    | `docker image rm`           | Remove one or more images                                                                |
-| dit     | `docker image tag`          | Add a name and tag to a particular image                                                 |
-|         |                             | **Docker Network**                                                                       |
-| dnc     | `docker network create`     | Create a new network                                                                     |
-| dncn    | `docker network connect`    | Connect a container to a network                                                         |
-| dndcn   | `docker network disconnect` | Disconnect a container from a network                                                    |
-| dni     | `docker network inspect`    | Return information about one or more networks                                            |
-| dnls    | `docker network ls`         | List all networks the engine daemon knows about, including those spanning multiple hosts |
-| dnrm    | `docker network rm`         | Remove one or more networks                                                              |
-|         |                             | **Docker Volume**                                                                        |
-| dvi     | `docker volume inspect`     | Display detailed information about one or more volumes                                   |
-| dvls    | `docker volume ls`          | List all the volumes known to  docker                                                    |
-| dvprune | `docker volume prune`       | Cleanup dangling volumes                                                                 |
+| Alias   | Command                       | Description                                                                              |
+| :------ | :---------------------------- | :--------------------------------------------------------------------------------------- |
+| dbl     | `docker build`                | Build an image from a Dockerfile                                                         |
+| dcin    | `docker container inspect`    | Display detailed information on one or more containers                                   |
+| dcls    | `docker container ls`         | List all the running docker containers                                                   |
+| dclsa   | `docker container ls -a`      | List all running and stopped containers                                                  |
+| dib     | `docker image build`          | Build an image from a Dockerfile (same as docker build)                                  |
+| dii     | `docker image inspect`        | Display detailed information on one or more images                                       |
+| dils    | `docker image ls`             | List docker images                                                                       |
+| dipu    | `docker image push`           | Push an image or repository to a remote registry                                         |
+| dirm    | `docker image rm`             | Remove one or more images                                                                |
+| dit     | `docker image tag`            | Add a name and tag to a particular image                                                 |
+| dlo     | `docker container logs`       | Fetch the logs of a docker container                                                     |
+| dnc     | `docker network create`       | Create a new network                                                                     |
+| dncn    | `docker network connect`      | Connect a container to a network                                                         |
+| dndcn   | `docker network disconnect`   | Disconnect a container from a network                                                    |
+| dni     | `docker network inspect`      | Return information about one or more networks                                            |
+| dnls    | `docker network ls`           | List all networks the engine daemon knows about, including those spanning multiple hosts |
+| dnrm    | `docker network rm`           | Remove one or more networks                                                              |
+| dpo     | `docker container port`       | List port mappings or a specific mapping for the container                               |
+| dpu     | `docker pull`                 | Pull an image or a repository from a registry                                            |
+| dr      | `docker container run`        | Create a new container and start it using the specified command                          |
+| drit    | `docker container run -it`    | Create a new container and start it in an interactive shell                              |
+| drm     | `docker container rm`         | Remove the specified container(s)                                                        |
+| drm!    | `docker container rm -f`      | Force the removal of a running container (uses SIGKILL)                                  |
+| dst     | `docker container start`      | Start one or more stopped containers                                                     |
+| dstp    | `docker container stop`       | Stop one or more running containers                                                      |
+| dtop    | `docker top`                  | Display the running processes of a container                                             |
+| dvi     | `docker volume inspect`       | Display detailed information about one or more volumes                                   |
+| dvls    | `docker volume ls`            | List all the volumes known to docker                                                     |
+| dvprune | `docker volume prune`         | Cleanup dangling volumes                                                                 |
+| dxc     | `docker container exec`       | Run a new command in a running container                                                 |
+| dxcit   | `docker container exec -it`   | Run a new command in a running container in an interactive shell                         |
diff --git a/plugins/docker/docker.plugin.zsh b/plugins/docker/docker.plugin.zsh
index 9c8ad8a28..483b3b97e 100644
--- a/plugins/docker/docker.plugin.zsh
+++ b/plugins/docker/docker.plugin.zsh
@@ -1,39 +1,31 @@
 alias dbl='docker build'
-alias dpu='docker pull'
-alias dtop='docker top'
-
-# docker containers
 alias dcin='docker container inspect'
-alias dlo='docker container logs'
 alias dcls='docker container ls'
 alias dclsa='docker container ls -a'
-alias dpo='docker container port'
-alias dr='docker container run'
-alias drit='docker container run -it'
-alias drm='docker container rm'
-alias 'drm!'='docker container rm -f'
-alias dst='docker container start'
-alias dstp='docker container stop'
-alias dxc='docker container exec'
-alias dxcit='docker container exec -it'
-
-# docker images
 alias dib='docker image build'
 alias dii='docker image inspect'
 alias dils='docker image ls'
 alias dipu='docker image push'
 alias dirm='docker image rm'
 alias dit='docker image tag'
-
-# docker network
+alias dlo='docker container logs'
 alias dnc='docker network create'
 alias dncn='docker network connect'
 alias dndcn='docker network disconnect'
 alias dni='docker network inspect'
 alias dnls='docker network ls'
 alias dnrm='docker network rm'
-
-# docker volume
+alias dpo='docker container port'
+alias dpu='docker pull'
+alias dr='docker container run'
+alias drit='docker container run -it'
+alias drm='docker container rm'
+alias 'drm!'='docker container rm -f'
+alias dst='docker container start'
+alias dstp='docker container stop'
+alias dtop='docker top'
 alias dvi='docker volume inspect'
 alias dvls='docker volume ls'
 alias dvprune='docker volume prune'
+alias dxc='docker container exec'
+alias dxcit='docker container exec -it'