From e10f19f952338b99b20391ef13720d05d0bccf16 Mon Sep 17 00:00:00 2001 From: Guillaume Lours Date: Tue, 26 Apr 2022 16:27:22 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Sebastiaan van Stijn Signed-off-by: Guillaume Lours --- compose/install.md | 26 ++++++++++++++------------ engine/install/centos.md | 2 +- engine/install/debian.md | 2 +- engine/install/fedora.md | 3 +-- engine/install/rhel.md | 3 +-- engine/install/sles.md | 3 +-- engine/install/ubuntu.md | 2 +- 7 files changed, 20 insertions(+), 21 deletions(-) diff --git a/compose/install.md b/compose/install.md index 35973554ea..4fc25e40cc 100644 --- a/compose/install.md +++ b/compose/install.md @@ -31,8 +31,7 @@ Linux systems. ## Install Compose -Follow the instructions below to install Compose on Mac, Windows, Windows Server -2016, or Linux systems. +Follow the instructions below to install Compose on Mac, Windows, Windows Server, or Linux systems. > Install a different version > @@ -42,6 +41,8 @@ Follow the instructions below to install Compose on Mac, Windows, Windows Server > > Compose releases are also listed and available for direct download on the > [Compose repository release page on GitHub](https://github.com/docker/compose/releases){:target="_blank" rel="noopener" class="_"}. +> +> To install the Python version of Compose, follow instructions in the [Compose v1 GitHub branch](https://github.com/docker/compose/blob/master/INSTALL.md){: target="_blank" rel="noopener" class="_"}.
  • Mac
    • @@ -98,15 +99,16 @@ on Microsoft Windows Server and want to install Docker Compose. Invoke-WebRequest "https://github.com/docker/compose/releases/download/{{site.compose_version}}/docker-compose-Windows-x86_64.exe" -UseBasicParsing -OutFile $Env:ProgramFiles\Docker\docker-compose.exe ``` - >**Note**: + > **Note** + > > On Windows Server 2019, you can add the Compose executable to `$Env:ProgramFiles\Docker`. Because this directory is registered in the system `PATH`, you can run the `docker-compose --version` command on the subsequent step with no additional configuration. - > To install a different version of Compose, substitute `{{site.compose_version}}` + > To install a different version of Compose, substitute `{{site.compose_version}}` > with the version of Compose you want to use. 3. Test the installation. - ```powershell + ```console $ docker compose version Docker Compose version {{site.compose_version}} ``` @@ -198,15 +200,15 @@ You can use Compose as a standalone binary without installing the Docker CLI. To uninstall Docker Compose if you installed using `curl`: - ```console - $ rm $DOCKER_CONFIG/cli-plugins/docker-compose - ``` +```console +$ rm $DOCKER_CONFIG/cli-plugins/docker-compose +``` - or if you choose to install Compose for all users +or if you choose to install Compose for all users - ```console - $ sudo rm /usr/local/lib/docker/cli-plugins/docker-compose - ``` +```console +$ sudo rm /usr/local/lib/docker/cli-plugins/docker-compose +``` > Got a "Permission denied" error? > diff --git a/engine/install/centos.md b/engine/install/centos.md index 641343482d..1e6453ec22 100644 --- a/engine/install/centos.md +++ b/engine/install/centos.md @@ -253,7 +253,7 @@ instead of `yum -y install`, and point to the new file. 1. Uninstall the Docker Engine, CLI, Containerd, and Docker Compose packages: ```console - $ sudo yum remove docker-ce docker-ce-cli containerd.io docker-compose-plugin + $ sudo yum remove docker-ce docker-ce-cli containerd.io ``` 2. Images, containers, volumes, or customized configuration files on your host diff --git a/engine/install/debian.md b/engine/install/debian.md index 636af2a1cd..200f9507bf 100644 --- a/engine/install/debian.md +++ b/engine/install/debian.md @@ -35,7 +35,7 @@ Older versions of Docker were called `docker`, `docker.io`, or `docker-engine`. If these are installed, uninstall them: ```console -$ sudo apt-get remove docker docker-engine docker.io containerd runc docker-compose-plugin +$ sudo apt-get remove docker docker-engine docker.io containerd runc ``` It's OK if `apt-get` reports that none of these packages are installed. diff --git a/engine/install/fedora.md b/engine/install/fedora.md index 0885807d14..5127f768a3 100644 --- a/engine/install/fedora.md +++ b/engine/install/fedora.md @@ -38,8 +38,7 @@ $ sudo dnf remove docker \ docker-logrotate \ docker-selinux \ docker-engine-selinux \ - docker-engine \ - docker-compose-plugin + docker-engine ``` It's OK if `dnf` reports that none of these packages are installed. diff --git a/engine/install/rhel.md b/engine/install/rhel.md index e2856ef65b..7a66edf2fa 100644 --- a/engine/install/rhel.md +++ b/engine/install/rhel.md @@ -49,8 +49,7 @@ $ sudo yum remove docker \ docker-logrotate \ docker-engine \ podman \ - docker-compose-plugin - runc \ + runc ``` It's OK if `yum` reports that none of these packages are installed. diff --git a/engine/install/sles.md b/engine/install/sles.md index 394a29de74..551637e720 100644 --- a/engine/install/sles.md +++ b/engine/install/sles.md @@ -66,8 +66,7 @@ $ sudo zypper remove docker \ docker-latest-logrotate \ docker-logrotate \ docker-engine \ - docker-compose-plugin - runc \ + runc ``` It's OK if `zypper` reports that none of these packages are installed. diff --git a/engine/install/ubuntu.md b/engine/install/ubuntu.md index b2ddbbbb37..20d6ea47ad 100644 --- a/engine/install/ubuntu.md +++ b/engine/install/ubuntu.md @@ -57,7 +57,7 @@ Older versions of Docker were called `docker`, `docker.io`, or `docker-engine`. If these are installed, uninstall them: ```console -$ sudo apt-get remove docker docker-engine docker.io containerd runc docker-compose-plugin +$ sudo apt-get remove docker docker-engine docker.io containerd runc ``` It's OK if `apt-get` reports that none of these packages are installed.