From b8348b3910d6d7ba053aadab88dd25838ee86273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Vantomme?= <akarzim@gmail.com>
Date: Wed, 17 Feb 2016 23:54:46 +0100
Subject: [PATCH 01/10] Feat (docker): add docker aliases

---
 modules/docker/README.md | 62 ++++++++++++++++++++++++++++++++++++++
 modules/docker/init.zsh  | 64 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 modules/docker/README.md
 create mode 100644 modules/docker/init.zsh

diff --git a/modules/docker/README.md b/modules/docker/README.md
new file mode 100644
index 0000000000..fb65c68825
--- /dev/null
+++ b/modules/docker/README.md
@@ -0,0 +1,62 @@
+# Docker
+
+Defines [Docker][1] aliases.
+
+## Aliases
+
+### Docker
+
+  - `dk` is short for `docker`
+  - `dka` Attach to a running container
+  - `dkb` Build an image from a Dockerfile
+  - `dkd` Inspect changes on a container's filesystem
+  - `dke` Run a command in a running container
+  - `dkE` Run an interactive command in a running container
+  - `dkh` Show the history of an image
+  - `dkk` Kill a running container
+  - `dkl` Fetch the logs of a container
+  - `dkn` Manage Docker networks
+  - `dkps` List containers
+  - `dkr` Run a command in a new container
+  - `dkrm` Remove one or more containers
+  - `dkrmi` Remove one or more images
+  - `dks` Start one or more stopped containers
+  - `dkS` Restart a container
+  - `dkss` Display a live stream of container(s) resource usage statistics
+  - `dkw` Block until a container stops, then print its exit code<Paste>
+  - `dkx` Stop a running container
+
+### Docker Machine
+
+  - `dkm` is short for `docker-machine`
+  - `dkmip` Get the IP address of a machine
+  - `dkmls` List machines
+  - `dkmps` alias for `dkmls`
+  - `dkms` Start a machine
+  - `dkmS` Restart a machine
+  - `dkmu` Get the URL of a machine
+  - `dkmup` Upgrade a machine to the latest version of Docker
+  - `dkmx` Stop a machine
+
+### Docker Compose
+
+  - `dkc` is short for `docker-compose`
+  - `dkcd` Stop and remove containers, networks, images, and volumes
+  - `dkck` Kill containers
+  - `dkcl` View output from containers
+  - `dkcps` List containers
+  - `dkcr` Run a one-off command
+  - `dkcrm` Remove stopped containers
+  - `dkcs` Start services
+  - `dkcS` Restart services
+  - `dkcu` Create and start containers
+  - `dkcx` Stop services
+
+## Author
+
+*The author of this module should be contacted via the [issue tracker][2].*
+
+  - [François Vantomme](https://github.com/akarzim)
+
+[1]: https://www.docker.com/
+[2]: https://github.com/akarzim/prezto/issues
diff --git a/modules/docker/init.zsh b/modules/docker/init.zsh
new file mode 100644
index 0000000000..ff499d290c
--- /dev/null
+++ b/modules/docker/init.zsh
@@ -0,0 +1,64 @@
+#
+# Defines Docker aliases.
+#
+# Author:
+#   François Vantomme <akarzim@gmail.com>
+#
+
+# Return if requirements are not found.
+if (( ! $+commands[docker] )); then
+  return 1
+fi
+
+#
+# Functions
+#
+function dkme {
+    eval $(docker-machine env $1)
+}
+
+#
+# Aliases
+#
+
+alias dk='docker'
+alias dka='docker attach'
+alias dkb='docker build'
+alias dkd='docker diff'
+alias dke='docker exec'
+alias dkE='docker exec -it'
+alias dkh='docker history'
+alias dkk='docker kill'
+alias dkl='docker logs'
+alias dkn='docker network'
+alias dkps='docker ps'
+alias dkr='docker run'
+alias dkrm='docker rm'
+alias dkrmi='docker rmi'
+alias dks='docker start'
+alias dkS='docker restart'
+alias dkss='docker stats'
+alias dkw='docker wait'
+alias dkx='docker stop'
+
+alias dkm='docker-machine'
+alias dkmip='docker-machine ip'
+alias dkmls='docker-machine ls'
+alias dkmps='docker-machine ps'
+alias dkms='docker-machine start'
+alias dkmS='docker-machine restart'
+alias dkmu='docker-machine url'
+alias dkmup='docker-machine upgrade'
+alias dkmx='docker-machine stop'
+
+alias dkc='docker-compose'
+alias dkcd='docker-compose down'
+alias dkck='docker-compose kill'
+alias dkcl='docker-compose logs'
+alias dkcps='docker-compose ps'
+alias dkcr='docker-compose run'
+alias dkcrm='docker-compose rm'
+alias dkcs='docker-compose start'
+alias dkcS='docker-compose restart'
+alias dkcu='docker-compose up'
+alias dkcx='docker-compose stop'

From ee49c46b4ca975f14302860f1857d8f084fd4880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Vantomme?= <akarzim@gmail.com>
Date: Wed, 14 Dec 2016 11:51:50 +0100
Subject: [PATCH 02/10] Feat (docker): add more aliases

Thanks to @malikoth and @saoula for their proposals
---
 modules/docker/README.md | 35 ++++++++++++++++++++
 modules/docker/init.zsh  | 69 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/modules/docker/README.md b/modules/docker/README.md
index fb65c68825..7c2d25aa92 100644
--- a/modules/docker/README.md
+++ b/modules/docker/README.md
@@ -13,43 +13,78 @@ Defines [Docker][1] aliases.
   - `dke` Run a command in a running container
   - `dkE` Run an interactive command in a running container
   - `dkh` Show the history of an image
+  - `dki` List images
+  - `dkin` Return low-level information on a container, image or task
   - `dkk` Kill a running container
   - `dkl` Fetch the logs of a container
+  - `dkli` Log in to a Docker registry
+  - `dklo` Log out from a Docker registry
   - `dkn` Manage Docker networks
+  - `dkp` Pause all processes within one or more containers<Paste>
+  - `dkP` Unpause all processes within one or more containers
   - `dkps` List containers
+  - `dkpsa` List all containers (default lists just running)
   - `dkr` Run a command in a new container
+  - `dkR` Run an interactive command in a new container and automatically remove
+  the container when it exits
+  - `dkRe` like `dkR` and set entry point to `/bin/bash`
   - `dkrm` Remove one or more containers
   - `dkrmi` Remove one or more images
+  - `dkrmC` Clean up exited containers
+  - `dkrmI` Clean up dangling images
   - `dks` Start one or more stopped containers
   - `dkS` Restart a container
   - `dkss` Display a live stream of container(s) resource usage statistics
+  - `dksw` Manage Docker Swarm
+  - `dkt` Tag an image into a repository
+  - `dktop` Display the running processes of a container
+  - `dkup` Update configuration of one or more containers
+  - `dkv` Manage Docker volumes
+  - `dkV` Show the Docker version information
   - `dkw` Block until a container stops, then print its exit code<Paste>
   - `dkx` Stop a running container
 
 ### Docker Machine
 
   - `dkm` is short for `docker-machine`
+  - `dkma` Get or set the active machine
+  - `dkmcp` Copy files between machines
+  - `dkme` Set up the environment for the Docker client
+  - `dkmin` Inspect information about a machine
   - `dkmip` Get the IP address of a machine
+  - `dkmk` Kill a machine
   - `dkmls` List machines
+  - `dkmpr` Re-provision existing machines
   - `dkmps` alias for `dkmls`
+  - `dkmrg` Regenerate TLS Certificates for a machine
+  - `dkmrm` Remove a machine
   - `dkms` Start a machine
+  - `dkmsh` Log into or run a command on a machine with SSH
+  - `dkmst` Get the status of a machine
   - `dkmS` Restart a machine
   - `dkmu` Get the URL of a machine
   - `dkmup` Upgrade a machine to the latest version of Docker
+  - `dkmV` Show the Docker Machine version or a machine docker version
   - `dkmx` Stop a machine
 
 ### Docker Compose
 
   - `dkc` is short for `docker-compose`
+  - `dkcb` Build or rebuild services
   - `dkcd` Stop and remove containers, networks, images, and volumes
+  - `dkce` Execute a command in a running container
   - `dkck` Kill containers
   - `dkcl` View output from containers
+  - `dkcp` Pause services
+  - `dkcP` Unpause services
   - `dkcps` List containers
   - `dkcr` Run a one-off command
   - `dkcrm` Remove stopped containers
   - `dkcs` Start services
+  - `dkcsc` Set number of containers for a service
   - `dkcS` Restart services
   - `dkcu` Create and start containers
+  - `dkcV` Show the Docker-Compose version information
   - `dkcx` Stop services
 
 ## Author
diff --git a/modules/docker/init.zsh b/modules/docker/init.zsh
index ff499d290c..fd0fc6b9fd 100644
--- a/modules/docker/init.zsh
+++ b/modules/docker/init.zsh
@@ -28,37 +28,106 @@ alias dkd='docker diff'
 alias dke='docker exec'
 alias dkE='docker exec -it'
 alias dkh='docker history'
+alias dki='docker images'
+alias dkin='docker inspect'
 alias dkk='docker kill'
 alias dkl='docker logs'
+alias dkli='docker login'
+alias dklo='docker logout'
 alias dkn='docker network'
+alias dkp='docker pause'
+alias dkP='docker unpause'
 alias dkps='docker ps'
+alias dkpsa='docker ps -a'
 alias dkr='docker run'
+alias dkR='docker run -it --rm'
+alias dkRe='docker run -it --rm --entrypoint /bin/bash'
 alias dkrm='docker rm'
 alias dkrmi='docker rmi'
+alias dkrn='docker rename'
 alias dks='docker start'
 alias dkS='docker restart'
 alias dkss='docker stats'
+alias dksw='docker swarm'
+alias dkt='docker tag'
+alias dktop='docker top'
+alias dkup='docker update'
+alias dkv='docker volume'
+alias dkV='docker version'
 alias dkw='docker wait'
 alias dkx='docker stop'
 
+# Clean up exited containers
+alias dkrmC='docker rm $(docker ps -a | grep Exited | awk '"'"'{ print $1 }'"'"')'
+
+# Clean up dangling images
+alias dkrmI='docker rmi $(docker images -f dangling=true -q)'
+
+## Non aliased docker commands:
+# commit   -- Create a new image from a container's changes
+# cp       -- Copy files/folders between a container and the local filesystem
+# create   -- Create a new container
+# daemon   -- Enable daemon mode
+# events   -- Get real time events from the server
+# export   -- Export a container's filesystem as a tar archive
+# import   -- Import the contents from a tarball to create a filesystem image
+# info     -- Display system-wide information
+# load     -- Load an image from a tar archive or STDIN
+# node     -- Manage Docker Swarm nodes
+# port     -- List port mappings or a specific mapping for the container
+# pull     -- Pull an image or a repository from a registry
+# push     -- Push an image or a repository to a registry
+# save     -- Save one or more images to a tar archive (streamed to STDOUT by default)
+# search   -- Search the Docker Hub for images
+# service  -- Manage Docker services
+
 alias dkm='docker-machine'
+alias dkma='docker-machine active'
+alias dkmcp='docker-machine scp'
+alias dkmin='docker-machine inspect'
 alias dkmip='docker-machine ip'
+alias dkmk='docker-machine kill'
 alias dkmls='docker-machine ls'
+alias dkmpr='docker-machine provision'
 alias dkmps='docker-machine ps'
+alias dkmrg='docker-machine regenerate-certs'
+alias dkmrm='docker-machine rm'
 alias dkms='docker-machine start'
+alias dkmsh='docker-machine ssh'
+alias dkmst='docker-machine status'
 alias dkmS='docker-machine restart'
 alias dkmu='docker-machine url'
 alias dkmup='docker-machine upgrade'
+alias dkmV='docker-machine version'
 alias dkmx='docker-machine stop'
 
+# Non aliased docker-machine commands:
+# config  -- Print the connection config for machine
+# create  -- Create a machine
+
 alias dkc='docker-compose'
+alias dkcb='docker-compose build'
 alias dkcd='docker-compose down'
+alias dkce='docker-compose exec'
 alias dkck='docker-compose kill'
 alias dkcl='docker-compose logs'
+alias dkp='docker-compose pause'
+alias dkP='docker-compose unpause'
 alias dkcps='docker-compose ps'
 alias dkcr='docker-compose run'
 alias dkcrm='docker-compose rm'
 alias dkcs='docker-compose start'
+alias dkcsc='docker-compose scale'
 alias dkcS='docker-compose restart'
 alias dkcu='docker-compose up'
+alias dkcV='docker-compose version'
 alias dkcx='docker-compose stop'
+
+## Non aliased docker-compose commands:
+# bundle  -- Generate a Docker bundle from the Compose file
+# config  -- Validate and view the compose file
+# create  -- Create services
+# events  -- Receive real time events from containers
+# port    -- Print the public port for a port binding
+# pull    -- Pull service images
+# push    -- Push service images

From c31be44cd4f1c0ff8900d770e9401fde6858a74c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Vantomme?= <akarzim@gmail.com>
Date: Wed, 14 Dec 2016 12:20:03 +0100
Subject: [PATCH 03/10] Feat (docker): add a volume cleanup alias

---
 modules/docker/README.md | 2 ++
 modules/docker/init.zsh  | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/docker/README.md b/modules/docker/README.md
index 7c2d25aa92..07b6e74989 100644
--- a/modules/docker/README.md
+++ b/modules/docker/README.md
@@ -32,6 +32,7 @@ Defines [Docker][1] aliases.
   - `dkrmi` Remove one or more images
   - `dkrmC` Clean up exited containers
   - `dkrmI` Clean up dangling images
+  - `dkrmV` Clean up unused volumes ( Docker >= 1.9 )
   - `dks` Start one or more stopped containers
   - `dkS` Restart a container
   - `dkss` Display a live stream of container(s) resource usage statistics
@@ -50,6 +51,7 @@ Defines [Docker][1] aliases.
   - `dkma` Get or set the active machine
   - `dkmcp` Copy files between machines
   - `dkme` Set up the environment for the Docker client
+        (eg: `dkme staging` to toggle to staging)
   - `dkmin` Inspect information about a machine
   - `dkmip` Get the IP address of a machine
   - `dkmk` Kill a machine
diff --git a/modules/docker/init.zsh b/modules/docker/init.zsh
index fd0fc6b9fd..dc0c5a1312 100644
--- a/modules/docker/init.zsh
+++ b/modules/docker/init.zsh
@@ -7,12 +7,14 @@
 
 # Return if requirements are not found.
 if (( ! $+commands[docker] )); then
-  return 1
+    return 1
 fi
 
 #
 # Functions
 #
+
+# Set Docker Machine environment
 function dkme {
     eval $(docker-machine env $1)
 }
@@ -63,6 +65,9 @@ alias dkrmC='docker rm $(docker ps -a | grep Exited | awk '"'"'{ print $1 }'"'"'
 # Clean up dangling images
 alias dkrmI='docker rmi $(docker images -f dangling=true -q)'
 
+# Clean up dangling volumes
+alias dkrmV='docker volume rm $(docker volume ls -qf dangling=true)'
+
 ## Non aliased docker commands:
 # commit   -- Create a new image from a container's changes
 # cp       -- Copy files/folders between a container and the local filesystem

From d417411ce5201e330c888732a6b660bca0ef5e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Vantomme?= <akarzim@gmail.com>
Date: Fri, 16 Dec 2016 14:44:17 +0100
Subject: [PATCH 04/10] Feat (docker): add an alias to run containers in
 background

---
 modules/docker/README.md | 2 ++
 modules/docker/init.zsh  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/modules/docker/README.md b/modules/docker/README.md
index 07b6e74989..f123c61344 100644
--- a/modules/docker/README.md
+++ b/modules/docker/README.md
@@ -86,6 +86,8 @@ Defines [Docker][1] aliases.
   - `dkcsc` Set number of containers for a service
   - `dkcS` Restart services
   - `dkcu` Create and start containers
+  - `dkcU` Create and start containers in detached mode:
+        Run containers in the background, print new container names
   - `dkcV` Show the Docker-Compose version information
   - `dkcx` Stop services
 
diff --git a/modules/docker/init.zsh b/modules/docker/init.zsh
index dc0c5a1312..c8f00655cb 100644
--- a/modules/docker/init.zsh
+++ b/modules/docker/init.zsh
@@ -125,6 +125,7 @@ alias dkcs='docker-compose start'
 alias dkcsc='docker-compose scale'
 alias dkcS='docker-compose restart'
 alias dkcu='docker-compose up'
+alias dkcU='docker-compose up -d'
 alias dkcV='docker-compose version'
 alias dkcx='docker-compose stop'
 

From 01f2d01657669b615a674a1381f0e061e70487ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Vantomme?= <akarzim@gmail.com>
Date: Fri, 16 Dec 2016 15:55:44 +0100
Subject: [PATCH 05/10] Feat (docker): add an alias to build containers with no
 cache

---
 modules/docker/README.md | 10 ++++++----
 modules/docker/init.zsh  |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/docker/README.md b/modules/docker/README.md
index f123c61344..4c2069460e 100644
--- a/modules/docker/README.md
+++ b/modules/docker/README.md
@@ -25,8 +25,8 @@ Defines [Docker][1] aliases.
   - `dkps` List containers
   - `dkpsa` List all containers (default lists just running)
   - `dkr` Run a command in a new container
-  - `dkR` Run an interactive command in a new container and automatically remove
-  the container when it exits
+  - `dkR` Run an interactive command in a new container
+          and automatically remove the container when it exits
   - `dkRe` like `dkR` and set entry point to `/bin/bash`
   - `dkrm` Remove one or more containers
   - `dkrmi` Remove one or more images
@@ -51,7 +51,7 @@ Defines [Docker][1] aliases.
   - `dkma` Get or set the active machine
   - `dkmcp` Copy files between machines
   - `dkme` Set up the environment for the Docker client
-        (eg: `dkme staging` to toggle to staging)
+           (eg: `dkme staging` to toggle to staging)
   - `dkmin` Inspect information about a machine
   - `dkmip` Get the IP address of a machine
   - `dkmk` Kill a machine
@@ -73,6 +73,8 @@ Defines [Docker][1] aliases.
 
   - `dkc` is short for `docker-compose`
   - `dkcb` Build or rebuild services
+  - `dkcB` Build or rebuild services
+           and do not use cache when building the image
   - `dkcd` Stop and remove containers, networks, images, and volumes
   - `dkce` Execute a command in a running container
   - `dkck` Kill containers
@@ -87,7 +89,7 @@ Defines [Docker][1] aliases.
   - `dkcS` Restart services
   - `dkcu` Create and start containers
   - `dkcU` Create and start containers in detached mode:
-        Run containers in the background, print new container names
+           Run containers in the background, print new container names
   - `dkcV` Show the Docker-Compose version information
   - `dkcx` Stop services
 
diff --git a/modules/docker/init.zsh b/modules/docker/init.zsh
index c8f00655cb..38c2cc9b0d 100644
--- a/modules/docker/init.zsh
+++ b/modules/docker/init.zsh
@@ -112,6 +112,7 @@ alias dkmx='docker-machine stop'
 
 alias dkc='docker-compose'
 alias dkcb='docker-compose build'
+alias dkcB='docker-compose build --no-cache'
 alias dkcd='docker-compose down'
 alias dkce='docker-compose exec'
 alias dkck='docker-compose kill'

From 40a20bd7d9338b1c8ded6d470c6078c59fb701e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Vantomme?= <akarzim@gmail.com>
Date: Sun, 5 Mar 2017 00:20:37 +0100
Subject: [PATCH 06/10] Feat (docker): add more aliases

---
 modules/docker/README.md | 252 ++++++++++++++++++++++++++-------------
 modules/docker/init.zsh  | 166 +++++++++++++++++++-------
 2 files changed, 290 insertions(+), 128 deletions(-)

diff --git a/modules/docker/README.md b/modules/docker/README.md
index 4c2069460e..9703b38684 100644
--- a/modules/docker/README.md
+++ b/modules/docker/README.md
@@ -1,103 +1,187 @@
-# Docker
+# ZSH Docker Aliases
 
-Defines [Docker][1] aliases.
+Defines [Docker][1] aliases and functions.
 
 ## Aliases
 
 ### Docker
 
-  - `dk` is short for `docker`
-  - `dka` Attach to a running container
-  - `dkb` Build an image from a Dockerfile
-  - `dkd` Inspect changes on a container's filesystem
-  - `dke` Run a command in a running container
-  - `dkE` Run an interactive command in a running container
-  - `dkh` Show the history of an image
-  - `dki` List images
-  - `dkin` Return low-level information on a container, image or task
-  - `dkk` Kill a running container
-  - `dkl` Fetch the logs of a container
-  - `dkli` Log in to a Docker registry
-  - `dklo` Log out from a Docker registry
-  - `dkn` Manage Docker networks
-  - `dkp` Pause all processes within one or more containers<Paste>
-  - `dkP` Unpause all processes within one or more containers
-  - `dkps` List containers
-  - `dkpsa` List all containers (default lists just running)
-  - `dkr` Run a command in a new container
-  - `dkR` Run an interactive command in a new container
-          and automatically remove the container when it exits
-  - `dkRe` like `dkR` and set entry point to `/bin/bash`
-  - `dkrm` Remove one or more containers
-  - `dkrmi` Remove one or more images
-  - `dkrmC` Clean up exited containers
-  - `dkrmI` Clean up dangling images
-  - `dkrmV` Clean up unused volumes ( Docker >= 1.9 )
-  - `dks` Start one or more stopped containers
-  - `dkS` Restart a container
-  - `dkss` Display a live stream of container(s) resource usage statistics
-  - `dksw` Manage Docker Swarm
-  - `dkt` Tag an image into a repository
-  - `dktop` Display the running processes of a container
-  - `dkup` Update configuration of one or more containers
-  - `dkv` Manage Docker volumes
-  - `dkV` Show the Docker version information
-  - `dkw` Block until a container stops, then print its exit code<Paste>
-  - `dkx` Stop a running container
+- `dk` is short for `docker`
+- `dka` Attach to a running container
+- `dkb` Build an image from a Dockerfile
+- `dkd` Inspect changes on a container's filesystem
+- `dkdf` Show docker filesystem usage
+- `dke` Run a command in a running container
+- `dkE` Run an interactive command in a running container
+- `dkh` Show the history of an image
+- `dki` List images
+- `dkin` Return low-level information on a container, image or task
+- `dkk` Kill a running container
+- `dkl` Fetch the logs of a container
+- `dkli` Log in to a Docker registry
+- `dklo` Log out from a Docker registry
+- `dkls` is alias for `dkps`
+- `dkp` Pause all processes within one or more containers<Paste>
+- `dkP` Unpause all processes within one or more containers
+- `dkpl` Pull an image or a repository from a registry
+- `dkph` Push an image or a repository to a registry
+- `dkps` List containers
+- `dkpsa` List all containers (default lists just running)
+- `dkr` Run a command in a new container
+- `dkR` Run an interactive command in a new container and automatically remove the container when it exits
+- `dkRe` like `dkR` and set entry point to `/bin/bash`
+- `dkrm` Remove one or more containers
+- `dkrmi` Remove one or more images
+- `dkrmC` Clean up exited containers
+- `dkrmI` Clean up dangling images
+- `dkrmV` Clean up unused volumes ( Docker >= 1.9 )
+- `dkrn` Rename a container
+- `dks` Start one or more stopped containers
+- `dkS` Restart a container
+- `dkss` Display a live stream of container(s) resource usage statistics
+- `dksv` Save one or more images to a tar archive (streamed to STDOUT by default)
+- `dkt` Tag an image into a repository
+- `dktop` Display the running processes of a container
+- `dkup` Update configuration of one or more containers
+- `dkV` Manage Docker volumes
+- `dkv` Show the Docker version information
+- `dkw` Block until a container stops, then print its exit code<Paste>
+- `dkx` Stop a running container
+
+#### container (C)
+
+- `dkC` Manage containers
+- `dkCa` Attach to a running container
+- `dkCcp` Copy files/folders between a container and the local filesystem
+- `dkCd` Inspect changes on a container's filesystem
+- `dkCe` Run a command in a running container
+- `dkCin` Display detailed information on one or more containers
+- `dkCk` Kill one or more running containers
+- `dkCl` Fetch the logs of a container
+- `dkCls` List containers
+- `dkCp` Pause all processes within one or more containers
+- `dkCpr` Remove all stopped containers
+- `dkCrn` Rename a container
+- `dkCS` Restart one or more containers
+- `dkCrm` Remove one or more containers
+- `dkCr` Run a command in a new container
+- `dkCR` Run an interactive command in a new container and automatically remove the container when it exits
+- `dkCRe` like `dkCR` and set entry point to `/bin/bash`
+- `dkCs` Start one or more stopped containers
+- `dkCss` Display a live stream of container(s) resource usage statistics
+- `dkCx` Stop one or more running containers
+- `dkCtop` Display the running processes of a container
+- `dkCP` Unpause all processes within one or more containers
+- `dkCup` Update configuration of one or more containers
+- `dkCw` Block until one or more containers stop, then print their exit codes
+
+#### image (I)
+
+- `dkI` Manage images
+- `dkIb` Build an image from a Dockerfile
+- `dkIh` Show the history of an image
+- `dkIim` Import the contents from a tarball to create a filesystem image
+- `dkIin` Display detailed information on one or more images
+- `dkIls` List images
+- `dkIpr` Remove unused images
+- `dkIpl` Pull an image or a repository from a registry
+- `dkIph` Push an image or a repository to a registry
+- `dkIrm` Remove one or more images
+- `dkIsv` Save one or more images to a tar archive (streamed to STDOUT by default)
+- `dkIt` Tag an image into a repository
+
+#### volume (V)
+
+- `dkV` Manage volumes
+- `dkVin` Display detailed information on one or more volumes
+- `dkVls` List volumes
+- `dkVpr` Remove all unused volumes
+- `dkVrm` Remove one or more volumes
+
+#### network (N)
+
+- `dkN` Manage networks
+- `dkNs` Connect a container to a network
+- `dkNx` Disconnects a container from a network
+- `dkNin` Displays detailed information on a network
+- `dkNls` Lists all the networks created by the user
+- `dkNpr` Remove all unused networks
+- `dkNrm` Deletes one or more networks
+
+#### system (Y)
+
+- `dkY` Manage Docker
+- `dkYdf` Show docker filesystem usage
+- `dkYpr` Remove unused data
+
+#### stack (K)
+
+- `dkK` Manage Docker stacks
+- `dkKls` List stacks
+- `dkKps` List the tasks in the stack
+- `dkKrm` Remove the stack
+
+#### swarm (W)
+
+- `dkW` Manage Docker Swarm
 
 ### Docker Machine
 
-  - `dkm` is short for `docker-machine`
-  - `dkma` Get or set the active machine
-  - `dkmcp` Copy files between machines
-  - `dkme` Set up the environment for the Docker client
-           (eg: `dkme staging` to toggle to staging)
-  - `dkmin` Inspect information about a machine
-  - `dkmip` Get the IP address of a machine
-  - `dkmk` Kill a machine
-  - `dkmls` List machines
-  - `dkmpr` Re-provision existing machines
-  - `dkmps` alias for `dkmls`
-  - `dkmrg` Regenerate TLS Certificates for a machine
-  - `dkmrm` Remove a machine
-  - `dkms` Start a machine
-  - `dkmsh` Log into or run a command on a machine with SSH
-  - `dkmst` Get the status of a machine
-  - `dkmS` Restart a machine
-  - `dkmu` Get the URL of a machine
-  - `dkmup` Upgrade a machine to the latest version of Docker
-  - `dkmV` Show the Docker Machine version or a machine docker version
-  - `dkmx` Stop a machine
+- `dkm` is short for `docker-machine`
+- `dkma` Get or set the active machine
+- `dkmcp` Copy files between machines
+- `dkmd` Set up the default machine ; alowing you to use `dkme` without arguments
+- `dkme` Set up the environment for the Docker client (eg: `dkme staging` to toggle to staging)
+- `dkmin` Inspect information about a machine
+- `dkmip` Get the IP address of a machine
+- `dkmk` Kill a machine
+- `dkmls` List machines
+- `dkmpr` Re-provision existing machines
+- `dkmps` is alias for `dkmls`
+- `dkmrg` Regenerate TLS Certificates for a machine
+- `dkmrm` Remove a machine
+- `dkms` Start a machine
+- `dkmsh` Log into or run a command on a machine with SSH
+- `dkmst` Get the status of a machine
+- `dkmS` Restart a machine
+- `dkmu` Get the URL of a machine
+- `dkmup` Upgrade a machine to the latest version of Docker
+- `dkmV` Show the Docker Machine version or a machine docker version
+- `dkmx` Stop a machine
 
 ### Docker Compose
 
-  - `dkc` is short for `docker-compose`
-  - `dkcb` Build or rebuild services
-  - `dkcB` Build or rebuild services
-           and do not use cache when building the image
-  - `dkcd` Stop and remove containers, networks, images, and volumes
-  - `dkce` Execute a command in a running container
-  - `dkck` Kill containers
-  - `dkcl` View output from containers
-  - `dkcp` Pause services
-  - `dkcP` Unpause services
-  - `dkcps` List containers
-  - `dkcr` Run a one-off command
-  - `dkcrm` Remove stopped containers
-  - `dkcs` Start services
-  - `dkcsc` Set number of containers for a service
-  - `dkcS` Restart services
-  - `dkcu` Create and start containers
-  - `dkcU` Create and start containers in detached mode:
+- `dkc` is short for `docker-compose`
+- `dkcb` Build or rebuild services
+- `dkcB` Build or rebuild services and do not use cache when building the image
+- `dkcd` Stop and remove containers, networks, images, and volumes
+- `dkce` Execute a command in a running container
+- `dkck` Kill containers
+- `dkcl` View output from containers
+- `dkcls` is alias for `dkcps`
+- `dkcp` Pause services
+- `dkcP` Unpause services
+- `dkcpl` Pull service images
+- `dkcph` Push service images
+- `dkcps` List containers
+- `dkcr` Run a one-off command
+- `dkcR` Run a one-off command and remove container after run.
+- `dkcrm` Remove stopped containers
+- `dkcs` Start services
+- `dkcsc` Set number of containers for a service
+- `dkcS` Restart services
+- `dkcu` Create and start containers
+- `dkcU` Create and start containers in detached mode:
            Run containers in the background, print new container names
-  - `dkcV` Show the Docker-Compose version information
-  - `dkcx` Stop services
+- `dkcV` Show the Docker-Compose version information
+- `dkcx` Stop services
 
 ## Author
 
-*The author of this module should be contacted via the [issue tracker][2].*
+*The author of this module should be contacted via the [issue tracker][3].*
 
-  - [François Vantomme](https://github.com/akarzim)
+- [François Vantomme](https://github.com/akarzim)
 
 [1]: https://www.docker.com/
-[2]: https://github.com/akarzim/prezto/issues
+[2]: https://github.com/zplug/zplug
+[3]: https://github.com/akarzim/zsh-docker-aliases/issues
diff --git a/modules/docker/init.zsh b/modules/docker/init.zsh
index 38c2cc9b0d..e125f8c31d 100644
--- a/modules/docker/init.zsh
+++ b/modules/docker/init.zsh
@@ -16,76 +16,162 @@ fi
 
 # Set Docker Machine environment
 function dkme {
+    if (( ! $+commands[docker-machine] )); then
+        return 1
+    fi
+
     eval $(docker-machine env $1)
 }
 
+# Set Docker Machine default machine
+function dkmd {
+    if (( ! $+commands[docker-machine] )); then
+        return 1
+    fi
+
+    pushd ~/.docker/machine/machines
+
+    if [[ ! -d $1 ]]; then
+        echo "Docker machine '$1' does not exists. Abort."
+        popd
+        return 1
+    fi
+
+    if [[ -L default ]]; then
+        eval $(rm -f default)
+    elif [[ -d default ]]; then
+        echo "A default manchine already exists. Abort."
+        popd
+        return 1
+    elif [[ -e default ]]; then
+        echo "A file named 'default' already exists. Abort."
+        popd
+        return 1
+    fi
+
+    eval $(ln -s $1 default)
+    popd
+}
+
 #
 # Aliases
 #
 
+# Docker
 alias dk='docker'
 alias dka='docker attach'
 alias dkb='docker build'
 alias dkd='docker diff'
+alias dkdf='docker system df'
 alias dke='docker exec'
 alias dkE='docker exec -it'
 alias dkh='docker history'
 alias dki='docker images'
 alias dkin='docker inspect'
+alias dkim='docker import'
 alias dkk='docker kill'
 alias dkl='docker logs'
 alias dkli='docker login'
 alias dklo='docker logout'
-alias dkn='docker network'
+alias dkls='docker ps'
 alias dkp='docker pause'
 alias dkP='docker unpause'
+alias dkpl='docker pull'
+alias dkph='docker push'
 alias dkps='docker ps'
 alias dkpsa='docker ps -a'
 alias dkr='docker run'
 alias dkR='docker run -it --rm'
 alias dkRe='docker run -it --rm --entrypoint /bin/bash'
+alias dkRM='docker system prune'
 alias dkrm='docker rm'
 alias dkrmi='docker rmi'
 alias dkrn='docker rename'
 alias dks='docker start'
 alias dkS='docker restart'
 alias dkss='docker stats'
-alias dksw='docker swarm'
+alias dksv='docker save'
 alias dkt='docker tag'
 alias dktop='docker top'
 alias dkup='docker update'
-alias dkv='docker volume'
-alias dkV='docker version'
+alias dkV='docker volume'
+alias dkv='docker version'
 alias dkw='docker wait'
 alias dkx='docker stop'
 
-# Clean up exited containers
-alias dkrmC='docker rm $(docker ps -a | grep Exited | awk '"'"'{ print $1 }'"'"')'
+alias dkC='docker container'
+alias dkCa='docker container attach'
+alias dkCcp='docker container cp'
+alias dkCd='docker container diff'
+alias dkCe='docker container exec'
+alias dkCin='docker container inspect'
+alias dkCk='docker container kill'
+alias dkCl='docker container logs'
+alias dkCls='docker container ls'
+alias dkCp='docker container pause'
+alias dkCpr='docker container prune'
+alias dkCrn='docker container rename'
+alias dkCS='docker container restart'
+alias dkCrm='docker container rm'
+alias dkCr='docker container run'
+alias dkCR='docker container run -it --rm'
+alias dkCRe='docker container run -it --rm --entrypoint /bin/bash'
+alias dkCs='docker container start'
+alias dkCss='docker container stats'
+alias dkCx='docker container stop'
+alias dkCtop='docker container top'
+alias dkCP='docker container unpause'
+alias dkCup='docker container update'
+alias dkCw='docker container wait'
 
-# Clean up dangling images
-alias dkrmI='docker rmi $(docker images -f dangling=true -q)'
+alias dkI='docker image'
+alias dkIb='docker image build'
+alias dkIh='docker image history'
+alias dkIim='docker image import'
+alias dkIin='docker image inspect'
+alias dkIls='docker image ls'
+alias dkIpr='docker image prune'
+alias dkIpl='docker image pull'
+alias dkIph='docker image push'
+alias dkIrm='docker image rm'
+alias dkIsv='docker image save'
+alias dkIt='docker image tag'
 
-# Clean up dangling volumes
-alias dkrmV='docker volume rm $(docker volume ls -qf dangling=true)'
+alias dkV='docker volume'
+alias dkVin='docker volume inspect'
+alias dkVls='docker volume ls'
+alias dkVpr='docker volume prune'
+alias dkVrm='docker volume rm'
+
+alias dkN='docker network'
+alias dkNs='docker network connect'
+alias dkNx='docker network disconnect'
+alias dkNin='docker network inspect'
+alias dkNls='docker network ls'
+alias dkNpr='docker network prune'
+alias dkNrm='docker network rm'
 
-## Non aliased docker commands:
-# commit   -- Create a new image from a container's changes
-# cp       -- Copy files/folders between a container and the local filesystem
-# create   -- Create a new container
-# daemon   -- Enable daemon mode
-# events   -- Get real time events from the server
-# export   -- Export a container's filesystem as a tar archive
-# import   -- Import the contents from a tarball to create a filesystem image
-# info     -- Display system-wide information
-# load     -- Load an image from a tar archive or STDIN
-# node     -- Manage Docker Swarm nodes
-# port     -- List port mappings or a specific mapping for the container
-# pull     -- Pull an image or a repository from a registry
-# push     -- Push an image or a repository to a registry
-# save     -- Save one or more images to a tar archive (streamed to STDOUT by default)
-# search   -- Search the Docker Hub for images
-# service  -- Manage Docker services
+alias dkY='docker system'
+alias dkYdf='docker system df'
+alias dkYpr='docker system prune'
 
+alias dkK='docker stack'
+alias dkKls='docker stack ls'
+alias dkKps='docker stack ps'
+alias dkKrm='docker stack rm'
+
+alias dkW='docker swarm'
+
+# Clean up exited containers (docker < 1.13)
+alias dkrmC='docker rm $(docker ps -qaf status=exited)'
+
+# Clean up dangling images (docker < 1.13)
+alias dkrmI='docker rmi $(docker images -qf dangling=true)'
+
+# Clean up dangling volumes (docker < 1.13)
+alias dkrmV='docker volume rm $(docker volume ls -qf dangling=true)'
+
+# Docker Machine
 alias dkm='docker-machine'
 alias dkma='docker-machine active'
 alias dkmcp='docker-machine scp'
@@ -103,13 +189,10 @@ alias dkmst='docker-machine status'
 alias dkmS='docker-machine restart'
 alias dkmu='docker-machine url'
 alias dkmup='docker-machine upgrade'
-alias dkmV='docker-machine version'
+alias dkmv='docker-machine version'
 alias dkmx='docker-machine stop'
 
-# Non aliased docker-machine commands:
-# config  -- Print the connection config for machine
-# create  -- Create a machine
-
+# Docker Compose
 alias dkc='docker-compose'
 alias dkcb='docker-compose build'
 alias dkcB='docker-compose build --no-cache'
@@ -117,24 +200,19 @@ alias dkcd='docker-compose down'
 alias dkce='docker-compose exec'
 alias dkck='docker-compose kill'
 alias dkcl='docker-compose logs'
-alias dkp='docker-compose pause'
-alias dkP='docker-compose unpause'
+alias dkcls='docker-compose ps'
+alias dkcp='docker-compose pause'
+alias dkcP='docker-compose unpause'
+alias dkcpl='docker-compose pull'
+alias dkcph='docker-compose push'
 alias dkcps='docker-compose ps'
 alias dkcr='docker-compose run'
+alias dkcR='docker-compose run --rm'
 alias dkcrm='docker-compose rm'
 alias dkcs='docker-compose start'
 alias dkcsc='docker-compose scale'
 alias dkcS='docker-compose restart'
 alias dkcu='docker-compose up'
 alias dkcU='docker-compose up -d'
-alias dkcV='docker-compose version'
+alias dkcv='docker-compose version'
 alias dkcx='docker-compose stop'
-
-## Non aliased docker-compose commands:
-# bundle  -- Generate a Docker bundle from the Compose file
-# config  -- Validate and view the compose file
-# create  -- Create services
-# events  -- Receive real time events from containers
-# port    -- Print the public port for a port binding
-# pull    -- Pull service images
-# push    -- Push service images

From ce88def3d9bf5050e30952a326a2d744cd76c6d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Vantomme?= <akarzim@gmail.com>
Date: Wed, 8 Mar 2017 09:20:03 +0100
Subject: [PATCH 07/10] Chore (readme): update Readme support and
 Acknowledgements

---
 modules/docker/README.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/docker/README.md b/modules/docker/README.md
index 9703b38684..335f77ad6a 100644
--- a/modules/docker/README.md
+++ b/modules/docker/README.md
@@ -176,12 +176,15 @@ Defines [Docker][1] aliases and functions.
 - `dkcV` Show the Docker-Compose version information
 - `dkcx` Stop services
 
-## Author
+## Support
 
-*The author of this module should be contacted via the [issue tracker][3].*
+If you're having problems, use the [Prezto issue tracker][2].
 
-- [François Vantomme](https://github.com/akarzim)
+## Acknowledgements
+
+This module is a copy of [akarzim/zsh-docker-aliases][3] by [François Vantomme][4] (MIT License).
 
 [1]: https://www.docker.com/
-[2]: https://github.com/zplug/zplug
-[3]: https://github.com/akarzim/zsh-docker-aliases/issues
+[2]: https://github.com/zsh-users/prezto/issues
+[3]: https://github.com/akarzim/zsh-docker-aliases
+[4]: https://github.com/akarzim

From 429900eb6ed81d2f7fcbeba7d40439bceff15a88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Vantomme?= <akarzim@gmail.com>
Date: Thu, 13 Apr 2017 11:25:02 +0200
Subject: [PATCH 08/10] Style (docker): use two-space tabs

---
 modules/autosuggestions/external          |  2 +-
 modules/completion/external               |  2 +-
 modules/docker/init.zsh                   | 60 +++++++++++------------
 modules/history-substring-search/external |  2 +-
 modules/prompt/external/agnoster          |  2 +-
 modules/prompt/external/powerline         |  2 +-
 modules/prompt/external/pure              |  2 +-
 modules/syntax-highlighting/external      |  2 +-
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/modules/autosuggestions/external b/modules/autosuggestions/external
index 9cfaf5d342..f0a745576f 160000
--- a/modules/autosuggestions/external
+++ b/modules/autosuggestions/external
@@ -1 +1 @@
-Subproject commit 9cfaf5d3424ceb5fedd2c7e3253f823faae74383
+Subproject commit f0a745576ff69fa608421ee7214d4cd77b43e62f
diff --git a/modules/completion/external b/modules/completion/external
index 72af5d08f1..69e89c5e4a 160000
--- a/modules/completion/external
+++ b/modules/completion/external
@@ -1 +1 @@
-Subproject commit 72af5d08f1c07507d74103af039e98a2791fccb5
+Subproject commit 69e89c5e4a1eae49325314df3718f0c734536e2a
diff --git a/modules/docker/init.zsh b/modules/docker/init.zsh
index e125f8c31d..65383fed9b 100644
--- a/modules/docker/init.zsh
+++ b/modules/docker/init.zsh
@@ -7,7 +7,7 @@
 
 # Return if requirements are not found.
 if (( ! $+commands[docker] )); then
-    return 1
+  return 1
 fi
 
 #
@@ -16,41 +16,41 @@ fi
 
 # Set Docker Machine environment
 function dkme {
-    if (( ! $+commands[docker-machine] )); then
-        return 1
-    fi
+  if (( ! $+commands[docker-machine] )); then
+    return 1
+  fi
 
-    eval $(docker-machine env $1)
+  eval $(docker-machine env $1)
 }
 
 # Set Docker Machine default machine
 function dkmd {
-    if (( ! $+commands[docker-machine] )); then
-        return 1
-    fi
-
-    pushd ~/.docker/machine/machines
-
-    if [[ ! -d $1 ]]; then
-        echo "Docker machine '$1' does not exists. Abort."
-        popd
-        return 1
-    fi
-
-    if [[ -L default ]]; then
-        eval $(rm -f default)
-    elif [[ -d default ]]; then
-        echo "A default manchine already exists. Abort."
-        popd
-        return 1
-    elif [[ -e default ]]; then
-        echo "A file named 'default' already exists. Abort."
-        popd
-        return 1
-    fi
-
-    eval $(ln -s $1 default)
+  if (( ! $+commands[docker-machine] )); then
+    return 1
+  fi
+
+  pushd ~/.docker/machine/machines
+
+  if [[ ! -d $1 ]]; then
+    echo "Docker machine '$1' does not exists. Abort."
+    popd
+    return 1
+  fi
+
+  if [[ -L default ]]; then
+    eval $(rm -f default)
+  elif [[ -d default ]]; then
+    echo "A default manchine already exists. Abort."
+    popd
+    return 1
+  elif [[ -e default ]]; then
+    echo "A file named 'default' already exists. Abort."
     popd
+    return 1
+  fi
+
+  eval $(ln -s $1 default)
+  popd
 }
 
 #
diff --git a/modules/history-substring-search/external b/modules/history-substring-search/external
index aae3388491..f5c164d4c3 160000
--- a/modules/history-substring-search/external
+++ b/modules/history-substring-search/external
@@ -1 +1 @@
-Subproject commit aae3388491c2312c4efb2e86bcb999927bb2900e
+Subproject commit f5c164d4c3af1f5bd068ee10f88b4c7b3a1fd841
diff --git a/modules/prompt/external/agnoster b/modules/prompt/external/agnoster
index f8ffdbfbe2..43cb371f36 160000
--- a/modules/prompt/external/agnoster
+++ b/modules/prompt/external/agnoster
@@ -1 +1 @@
-Subproject commit f8ffdbfbe2c2d8cd1350eae1b68367802fe6df26
+Subproject commit 43cb371f361eecf62e9dac7afc73a1c16edf89c7
diff --git a/modules/prompt/external/powerline b/modules/prompt/external/powerline
index c48e4c69ef..8e81152340 160000
--- a/modules/prompt/external/powerline
+++ b/modules/prompt/external/powerline
@@ -1 +1 @@
-Subproject commit c48e4c69ef5c368ea7cda961ed9d0e298a5ae1fc
+Subproject commit 8e81152340c4beb2d941340d1feb2dc29bbcc309
diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure
index 04fa7495cf..7d96270704 160000
--- a/modules/prompt/external/pure
+++ b/modules/prompt/external/pure
@@ -1 +1 @@
-Subproject commit 04fa7495cf8fe3aff8ce286d4517df15066b820a
+Subproject commit 7d96270704e0dfa1162e33398176bb6b792d615c
diff --git a/modules/syntax-highlighting/external b/modules/syntax-highlighting/external
index 15d4587514..12b879caf7 160000
--- a/modules/syntax-highlighting/external
+++ b/modules/syntax-highlighting/external
@@ -1 +1 @@
-Subproject commit 15d4587514a3beaa13972093e335bf685b6726a9
+Subproject commit 12b879caf7a6f96921d1c03ab9b839a7f6c8eb1e

From e76828269b10841d058e5503aac17620b3228a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Vantomme?= <akarzim@gmail.com>
Date: Thu, 13 Apr 2017 11:26:57 +0200
Subject: [PATCH 09/10] Fix (docker): typo on machine

---
 modules/docker/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/docker/init.zsh b/modules/docker/init.zsh
index 65383fed9b..0badd0e3ac 100644
--- a/modules/docker/init.zsh
+++ b/modules/docker/init.zsh
@@ -40,7 +40,7 @@ function dkmd {
   if [[ -L default ]]; then
     eval $(rm -f default)
   elif [[ -d default ]]; then
-    echo "A default manchine already exists. Abort."
+    echo "A default machine already exists. Abort."
     popd
     return 1
   elif [[ -e default ]]; then

From 7800f9285e333af1f429899e00b8171eaf35cfe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Vantomme?= <akarzim@gmail.com>
Date: Thu, 13 Apr 2017 11:37:11 +0200
Subject: [PATCH 10/10] Refactor (docker): extract aliases into their own shell
 script

---
 modules/docker/alias.zsh | 177 +++++++++++++++++++++++++++++++++++++++
 modules/docker/init.zsh  | 165 +-----------------------------------
 2 files changed, 179 insertions(+), 163 deletions(-)
 create mode 100644 modules/docker/alias.zsh

diff --git a/modules/docker/alias.zsh b/modules/docker/alias.zsh
new file mode 100644
index 0000000000..cdd9f7c825
--- /dev/null
+++ b/modules/docker/alias.zsh
@@ -0,0 +1,177 @@
+#
+# Defines Docker aliases.
+#
+# Author:
+#   François Vantomme <akarzim@gmail.com>
+#
+
+#
+# Aliases
+#
+
+# Docker
+alias dk='docker'
+alias dka='docker attach'
+alias dkb='docker build'
+alias dkd='docker diff'
+alias dkdf='docker system df'
+alias dke='docker exec'
+alias dkE='docker exec -it'
+alias dkh='docker history'
+alias dki='docker images'
+alias dkin='docker inspect'
+alias dkim='docker import'
+alias dkk='docker kill'
+alias dkl='docker logs'
+alias dkli='docker login'
+alias dklo='docker logout'
+alias dkls='docker ps'
+alias dkp='docker pause'
+alias dkP='docker unpause'
+alias dkpl='docker pull'
+alias dkph='docker push'
+alias dkps='docker ps'
+alias dkpsa='docker ps -a'
+alias dkr='docker run'
+alias dkR='docker run -it --rm'
+alias dkRe='docker run -it --rm --entrypoint /bin/bash'
+alias dkRM='docker system prune'
+alias dkrm='docker rm'
+alias dkrmi='docker rmi'
+alias dkrn='docker rename'
+alias dks='docker start'
+alias dkS='docker restart'
+alias dkss='docker stats'
+alias dksv='docker save'
+alias dkt='docker tag'
+alias dktop='docker top'
+alias dkup='docker update'
+alias dkV='docker volume'
+alias dkv='docker version'
+alias dkw='docker wait'
+alias dkx='docker stop'
+
+## Container (C)
+alias dkC='docker container'
+alias dkCa='docker container attach'
+alias dkCcp='docker container cp'
+alias dkCd='docker container diff'
+alias dkCe='docker container exec'
+alias dkCin='docker container inspect'
+alias dkCk='docker container kill'
+alias dkCl='docker container logs'
+alias dkCls='docker container ls'
+alias dkCp='docker container pause'
+alias dkCpr='docker container prune'
+alias dkCrn='docker container rename'
+alias dkCS='docker container restart'
+alias dkCrm='docker container rm'
+alias dkCr='docker container run'
+alias dkCR='docker container run -it --rm'
+alias dkCRe='docker container run -it --rm --entrypoint /bin/bash'
+alias dkCs='docker container start'
+alias dkCss='docker container stats'
+alias dkCx='docker container stop'
+alias dkCtop='docker container top'
+alias dkCP='docker container unpause'
+alias dkCup='docker container update'
+alias dkCw='docker container wait'
+
+## Image (I)
+alias dkI='docker image'
+alias dkIb='docker image build'
+alias dkIh='docker image history'
+alias dkIim='docker image import'
+alias dkIin='docker image inspect'
+alias dkIls='docker image ls'
+alias dkIpr='docker image prune'
+alias dkIpl='docker image pull'
+alias dkIph='docker image push'
+alias dkIrm='docker image rm'
+alias dkIsv='docker image save'
+alias dkIt='docker image tag'
+
+## Volume (V)
+alias dkV='docker volume'
+alias dkVin='docker volume inspect'
+alias dkVls='docker volume ls'
+alias dkVpr='docker volume prune'
+alias dkVrm='docker volume rm'
+
+## Network (N)
+alias dkN='docker network'
+alias dkNs='docker network connect'
+alias dkNx='docker network disconnect'
+alias dkNin='docker network inspect'
+alias dkNls='docker network ls'
+alias dkNpr='docker network prune'
+alias dkNrm='docker network rm'
+
+## System (Y)
+alias dkY='docker system'
+alias dkYdf='docker system df'
+alias dkYpr='docker system prune'
+
+## Stack (K)
+alias dkK='docker stack'
+alias dkKls='docker stack ls'
+alias dkKps='docker stack ps'
+alias dkKrm='docker stack rm'
+
+## Swarm (W)
+alias dkW='docker swarm'
+
+## CleanUp (rm)
+# Clean up exited containers (docker < 1.13)
+alias dkrmC='docker rm $(docker ps -qaf status=exited)'
+# Clean up dangling images (docker < 1.13)
+alias dkrmI='docker rmi $(docker images -qf dangling=true)'
+# Clean up dangling volumes (docker < 1.13)
+alias dkrmV='docker volume rm $(docker volume ls -qf dangling=true)'
+
+
+# Docker Machine (m)
+alias dkm='docker-machine'
+alias dkma='docker-machine active'
+alias dkmcp='docker-machine scp'
+alias dkmin='docker-machine inspect'
+alias dkmip='docker-machine ip'
+alias dkmk='docker-machine kill'
+alias dkmls='docker-machine ls'
+alias dkmpr='docker-machine provision'
+alias dkmps='docker-machine ps'
+alias dkmrg='docker-machine regenerate-certs'
+alias dkmrm='docker-machine rm'
+alias dkms='docker-machine start'
+alias dkmsh='docker-machine ssh'
+alias dkmst='docker-machine status'
+alias dkmS='docker-machine restart'
+alias dkmu='docker-machine url'
+alias dkmup='docker-machine upgrade'
+alias dkmv='docker-machine version'
+alias dkmx='docker-machine stop'
+
+# Docker Compose (c)
+alias dkc='docker-compose'
+alias dkcb='docker-compose build'
+alias dkcB='docker-compose build --no-cache'
+alias dkcd='docker-compose down'
+alias dkce='docker-compose exec'
+alias dkck='docker-compose kill'
+alias dkcl='docker-compose logs'
+alias dkcls='docker-compose ps'
+alias dkcp='docker-compose pause'
+alias dkcP='docker-compose unpause'
+alias dkcpl='docker-compose pull'
+alias dkcph='docker-compose push'
+alias dkcps='docker-compose ps'
+alias dkcr='docker-compose run'
+alias dkcR='docker-compose run --rm'
+alias dkcrm='docker-compose rm'
+alias dkcs='docker-compose start'
+alias dkcsc='docker-compose scale'
+alias dkcS='docker-compose restart'
+alias dkcu='docker-compose up'
+alias dkcU='docker-compose up -d'
+alias dkcv='docker-compose version'
+alias dkcx='docker-compose stop'
diff --git a/modules/docker/init.zsh b/modules/docker/init.zsh
index 0badd0e3ac..8ad6bfddf9 100644
--- a/modules/docker/init.zsh
+++ b/modules/docker/init.zsh
@@ -53,166 +53,5 @@ function dkmd {
   popd
 }
 
-#
-# Aliases
-#
-
-# Docker
-alias dk='docker'
-alias dka='docker attach'
-alias dkb='docker build'
-alias dkd='docker diff'
-alias dkdf='docker system df'
-alias dke='docker exec'
-alias dkE='docker exec -it'
-alias dkh='docker history'
-alias dki='docker images'
-alias dkin='docker inspect'
-alias dkim='docker import'
-alias dkk='docker kill'
-alias dkl='docker logs'
-alias dkli='docker login'
-alias dklo='docker logout'
-alias dkls='docker ps'
-alias dkp='docker pause'
-alias dkP='docker unpause'
-alias dkpl='docker pull'
-alias dkph='docker push'
-alias dkps='docker ps'
-alias dkpsa='docker ps -a'
-alias dkr='docker run'
-alias dkR='docker run -it --rm'
-alias dkRe='docker run -it --rm --entrypoint /bin/bash'
-alias dkRM='docker system prune'
-alias dkrm='docker rm'
-alias dkrmi='docker rmi'
-alias dkrn='docker rename'
-alias dks='docker start'
-alias dkS='docker restart'
-alias dkss='docker stats'
-alias dksv='docker save'
-alias dkt='docker tag'
-alias dktop='docker top'
-alias dkup='docker update'
-alias dkV='docker volume'
-alias dkv='docker version'
-alias dkw='docker wait'
-alias dkx='docker stop'
-
-alias dkC='docker container'
-alias dkCa='docker container attach'
-alias dkCcp='docker container cp'
-alias dkCd='docker container diff'
-alias dkCe='docker container exec'
-alias dkCin='docker container inspect'
-alias dkCk='docker container kill'
-alias dkCl='docker container logs'
-alias dkCls='docker container ls'
-alias dkCp='docker container pause'
-alias dkCpr='docker container prune'
-alias dkCrn='docker container rename'
-alias dkCS='docker container restart'
-alias dkCrm='docker container rm'
-alias dkCr='docker container run'
-alias dkCR='docker container run -it --rm'
-alias dkCRe='docker container run -it --rm --entrypoint /bin/bash'
-alias dkCs='docker container start'
-alias dkCss='docker container stats'
-alias dkCx='docker container stop'
-alias dkCtop='docker container top'
-alias dkCP='docker container unpause'
-alias dkCup='docker container update'
-alias dkCw='docker container wait'
-
-alias dkI='docker image'
-alias dkIb='docker image build'
-alias dkIh='docker image history'
-alias dkIim='docker image import'
-alias dkIin='docker image inspect'
-alias dkIls='docker image ls'
-alias dkIpr='docker image prune'
-alias dkIpl='docker image pull'
-alias dkIph='docker image push'
-alias dkIrm='docker image rm'
-alias dkIsv='docker image save'
-alias dkIt='docker image tag'
-
-alias dkV='docker volume'
-alias dkVin='docker volume inspect'
-alias dkVls='docker volume ls'
-alias dkVpr='docker volume prune'
-alias dkVrm='docker volume rm'
-
-alias dkN='docker network'
-alias dkNs='docker network connect'
-alias dkNx='docker network disconnect'
-alias dkNin='docker network inspect'
-alias dkNls='docker network ls'
-alias dkNpr='docker network prune'
-alias dkNrm='docker network rm'
-
-alias dkY='docker system'
-alias dkYdf='docker system df'
-alias dkYpr='docker system prune'
-
-alias dkK='docker stack'
-alias dkKls='docker stack ls'
-alias dkKps='docker stack ps'
-alias dkKrm='docker stack rm'
-
-alias dkW='docker swarm'
-
-# Clean up exited containers (docker < 1.13)
-alias dkrmC='docker rm $(docker ps -qaf status=exited)'
-
-# Clean up dangling images (docker < 1.13)
-alias dkrmI='docker rmi $(docker images -qf dangling=true)'
-
-# Clean up dangling volumes (docker < 1.13)
-alias dkrmV='docker volume rm $(docker volume ls -qf dangling=true)'
-
-# Docker Machine
-alias dkm='docker-machine'
-alias dkma='docker-machine active'
-alias dkmcp='docker-machine scp'
-alias dkmin='docker-machine inspect'
-alias dkmip='docker-machine ip'
-alias dkmk='docker-machine kill'
-alias dkmls='docker-machine ls'
-alias dkmpr='docker-machine provision'
-alias dkmps='docker-machine ps'
-alias dkmrg='docker-machine regenerate-certs'
-alias dkmrm='docker-machine rm'
-alias dkms='docker-machine start'
-alias dkmsh='docker-machine ssh'
-alias dkmst='docker-machine status'
-alias dkmS='docker-machine restart'
-alias dkmu='docker-machine url'
-alias dkmup='docker-machine upgrade'
-alias dkmv='docker-machine version'
-alias dkmx='docker-machine stop'
-
-# Docker Compose
-alias dkc='docker-compose'
-alias dkcb='docker-compose build'
-alias dkcB='docker-compose build --no-cache'
-alias dkcd='docker-compose down'
-alias dkce='docker-compose exec'
-alias dkck='docker-compose kill'
-alias dkcl='docker-compose logs'
-alias dkcls='docker-compose ps'
-alias dkcp='docker-compose pause'
-alias dkcP='docker-compose unpause'
-alias dkcpl='docker-compose pull'
-alias dkcph='docker-compose push'
-alias dkcps='docker-compose ps'
-alias dkcr='docker-compose run'
-alias dkcR='docker-compose run --rm'
-alias dkcrm='docker-compose rm'
-alias dkcs='docker-compose start'
-alias dkcsc='docker-compose scale'
-alias dkcS='docker-compose restart'
-alias dkcu='docker-compose up'
-alias dkcU='docker-compose up -d'
-alias dkcv='docker-compose version'
-alias dkcx='docker-compose stop'
+# Source module files.
+source "${0:h}/alias.zsh"