Merge remote-tracking branch 'github/master'HEADmaster

2 files changed, 14 insertions, 2 deletions

diff --git a/plugins/docker/README.md b/plugins/docker/README.md
index 0ab2e41fb..0bc24b54a 100644
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@@ -39,6 +39,10 @@ following setting. See https://github.com/ohmyzsh/ohmyzsh/issues/11789 for more
 zstyle ':omz:plugins:docker' legacy-completion yes
 ```
 
+### For Podman's Docker wrapper users
+
+If you use Podman's Docker wrapper, you need to enable legacy completion. See above section.
+
 ## Aliases
 
 | Alias   | Command                       | Description                                                                              |
@@ -51,6 +55,7 @@ zstyle ':omz:plugins:docker' legacy-completion yes
 | 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                                         |
+| dipru   | `docker image prune -a`       | Remove all images not referenced by any container                                        |
 | 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                                                     |
@@ -61,6 +66,8 @@ zstyle ':omz:plugins:docker' legacy-completion yes
 | 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                               |
+| dps     | `docker ps`                   | List all the running docker containers                                                   |
+| dpsa    | `docker ps -a`                | List all running and stopped containers                                                  |
 | 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                              |
@@ -70,6 +77,7 @@ zstyle ':omz:plugins:docker' legacy-completion yes
 | drs     | `docker container restart`    | Restart one or more containers                                                           |
 | dsta    | `docker stop $(docker ps -q)` | Stop all running containers                                                              |
 | dstp    | `docker container stop`       | Stop one or more running containers                                                      |
+| dsts    | `docker stats`                | Display real-time streaming statistics for 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                                                     |
diff --git a/plugins/docker/docker.plugin.zsh b/plugins/docker/docker.plugin.zsh
index 7e657f2df..5268f6cd6 100644
--- a/plugins/docker/docker.plugin.zsh
+++ b/plugins/docker/docker.plugin.zsh
@@ -6,6 +6,7 @@ alias dib='docker image build'
 alias dii='docker image inspect'
 alias dils='docker image ls'
 alias dipu='docker image push'
+alias dipru='docker image prune -a'
 alias dirm='docker image rm'
 alias dit='docker image tag'
 alias dlo='docker container logs'
@@ -16,6 +17,8 @@ alias dni='docker network inspect'
 alias dnls='docker network ls'
 alias dnrm='docker network rm'
 alias dpo='docker container port'
+alias dps='docker ps'
+alias dpsa='docker ps -a'
 alias dpu='docker pull'
 alias dr='docker container run'
 alias drit='docker container run -it'
@@ -25,6 +28,7 @@ alias dst='docker container start'
 alias drs='docker container restart'
 alias dsta='docker stop $(docker ps -q)'
 alias dstp='docker container stop'
+alias dsts='docker stats'
 alias dtop='docker top'
 alias dvi='docker volume inspect'
 alias dvls='docker volume ls'
@@ -36,7 +40,7 @@ if (( ! $+commands[docker] )); then
   return
 fi
 
-# Standarized $0 handling
+# Standardized $0 handling
 # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
@@ -57,6 +61,6 @@ fi
     ! is-at-least 23.0.0 ${${(s:,:z)"$(command docker --version)"}[3]}; then
         command cp "${0:h}/completions/_docker" "$ZSH_CACHE_DIR/completions/_docker"
       else
-        command docker completion zsh >| "$ZSH_CACHE_DIR/completions/_docker"
+        command docker completion zsh | tee "$ZSH_CACHE_DIR/completions/_docker" > /dev/null
   fi
 } &|