Diff
1diff --git a/plugins/docker-compose/README.md b/plugins/docker-compose/README.md
2index 5a0290462474c5e51a8aaae49634fa5133da02de..73035b9a581971d8e151a2716e5ea1b212be80a1 100644
3--- a/plugins/docker-compose/README.md
4+++ b/plugins/docker-compose/README.md
5@@ -1,9 +1,8 @@
6 # Docker-compose
7
8-This plugin provides completion for [docker-compose](https://docs.docker.com/compose/) as well as some
9-aliases for frequent docker-compose commands.
10-This plugin chooses automatically between the legacy `docker-compose` command and the modern
11-`docker compose` subcommand, preferring `docker-compose` when both are available.
12+This plugin provides completion for [Docker Compose](https://docs.docker.com/compose/) and aliases for
13+frequent Docker Compose commands. It uses the `docker compose` subcommand when Docker is available,
14+and falls back to the legacy `docker-compose` command otherwise.
15
16 To use it, add docker-compose to the plugins array of your zshrc file:
17
18@@ -15,22 +14,22 @@ plugins=(... docker-compose)
19
20 | Alias | Command | Description |
21 |-----------|----------------------------------|----------------------------------------------------------------------------------|
22-| dco | `docker-compose` | Docker-compose main command |
23-| dcb | `docker-compose build` | Build containers |
24-| dce | `docker-compose exec` | Execute command inside a container |
25-| dcps | `docker-compose ps` | List containers |
26-| dcrestart | `docker-compose restart` | Restart container |
27-| dcrm | `docker-compose rm` | Remove container |
28-| dcr | `docker-compose run` | Run a command in container |
29-| dcstop | `docker-compose stop` | Stop a container |
30-| dcup | `docker-compose up` | Build, (re)create, start, and attach to containers for a service |
31-| dcupb | `docker-compose up --build` | Same as `dcup`, but build images before starting containers |
32-| dcupd | `docker-compose up -d` | Same as `dcup`, but starts as daemon |
33-| dcupdb | `docker-compose up -d --build` | Same as `dcup`, but build images before starting containers and starts as daemon |
34-| dcdn | `docker-compose down` | Stop and remove containers |
35-| dcl | `docker-compose logs` | Show logs of container |
36-| dclf | `docker-compose logs -f` | Show logs and follow output |
37-| dclF | `docker-compose logs -f --tail0` | Just follow recent logs |
38-| dcpull | `docker-compose pull` | Pull image of a service |
39-| dcstart | `docker-compose start` | Start a container |
40-| dck | `docker-compose kill` | Kills containers |
41+| dco | `docker compose` | Docker Compose main command |
42+| dcb | `docker compose build` | Build containers |
43+| dce | `docker compose exec` | Execute command inside a container |
44+| dcps | `docker compose ps` | List containers |
45+| dcrestart | `docker compose restart` | Restart container |
46+| dcrm | `docker compose rm` | Remove container |
47+| dcr | `docker compose run` | Run a command in container |
48+| dcstop | `docker compose stop` | Stop a container |
49+| dcup | `docker compose up` | Build, (re)create, start, and attach to containers for a service |
50+| dcupb | `docker compose up --build` | Same as `dcup`, but build images before starting containers |
51+| dcupd | `docker compose up -d` | Same as `dcup`, but starts as daemon |
52+| dcupdb | `docker compose up -d --build` | Same as `dcup`, but build images before starting containers and starts as daemon |
53+| dcdn | `docker compose down` | Stop and remove containers |
54+| dcl | `docker compose logs` | Show logs of container |
55+| dclf | `docker compose logs -f` | Show logs and follow output |
56+| dclF | `docker compose logs -f --tail0` | Just follow recent logs |
57+| dcpull | `docker compose pull` | Pull image of a service |
58+| dcstart | `docker compose start` | Start a container |
59+| dck | `docker compose kill` | Kills containers |
60diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
61index 7863c4f39090c22098668b4b6080a62ace5d7c38..af75ebcb655fcb05919ee5c8a3bfeeae938c3c89 100644
62--- a/plugins/docker-compose/docker-compose.plugin.zsh
63+++ b/plugins/docker-compose/docker-compose.plugin.zsh
64@@ -1,8 +1,6 @@
65-# Support Compose v2 as docker CLI plugin
66-#
67-# This tests that the (old) docker-compose command is in $PATH and that
68-# it resolves to an existing executable file if it's a symlink.
69-[[ -x "${commands[docker-compose]:A}" ]] && dccmd='docker-compose' || dccmd='docker compose'
70+# Support the legacy docker-compose command when Docker is unavailable.
71+# Resolve symlinks before testing the Docker executable.
72+[[ -x "${commands[docker]:A}" ]] && dccmd='docker compose' || dccmd='docker-compose'
73
74 alias dco="$dccmd"
75 alias dcb="$dccmd build"