From fee069375ec0fb0bb80a0dfb8180f3cf54ac3cbd Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Feb 2018 19:15:18 +0100 Subject: [PATCH] Add more packages to uninstall before installation (#6092) The CentOS, Red Hat, and Fedora package-repositories contain several versions of the docker package. Some of those were missing from the list of packages to uninstall, and could conflict with the docker-ce/docker-ee package. Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/centos.md | 6 ++++++ install/linux/docker-ce/fedora.md | 5 +++++ install/linux/docker-ee/centos.md | 5 +++++ install/linux/docker-ee/rhel.md | 8 +++++++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/install/linux/docker-ce/centos.md b/install/linux/docker-ce/centos.md index e3997c218e..3b2089f7e3 100644 --- a/install/linux/docker-ce/centos.md +++ b/install/linux/docker-ce/centos.md @@ -41,8 +41,14 @@ installed, uninstall them, along with associated dependencies. ```bash $ sudo yum remove docker \ + docker-client \ + docker-client-latest \ docker-common \ + docker-latest \ + docker-latest-logrotate \ + docker-logrotate \ docker-selinux \ + docker-engine-selinux \ docker-engine ``` diff --git a/install/linux/docker-ce/fedora.md b/install/linux/docker-ce/fedora.md index 39dea255be..55e771ddb3 100644 --- a/install/linux/docker-ce/fedora.md +++ b/install/linux/docker-ce/fedora.md @@ -35,7 +35,12 @@ installed, uninstall them, along with associated dependencies. ```bash $ sudo dnf remove docker \ + docker-client \ + docker-client-latest \ docker-common \ + docker-latest \ + docker-latest-logrotate \ + docker-logrotate \ docker-selinux \ docker-engine-selinux \ docker-engine diff --git a/install/linux/docker-ee/centos.md b/install/linux/docker-ee/centos.md index d802d697a9..05d9d249cb 100644 --- a/install/linux/docker-ee/centos.md +++ b/install/linux/docker-ee/centos.md @@ -57,7 +57,12 @@ if you are upgrading from Docker CE to Docker EE, remove the Docker CE package. ```bash $ sudo yum remove docker \ + docker-client \ + docker-client-latest \ docker-common \ + docker-latest \ + docker-latest-logrotate \ + docker-logrotate \ docker-selinux \ docker-engine-selinux \ docker-engine \ diff --git a/install/linux/docker-ee/rhel.md b/install/linux/docker-ee/rhel.md index a1e1930f5f..25bf734bc8 100644 --- a/install/linux/docker-ee/rhel.md +++ b/install/linux/docker-ee/rhel.md @@ -67,10 +67,16 @@ installed, uninstall them, along with associated dependencies. ```bash $ sudo yum remove docker \ + docker-client \ + docker-client-latest \ docker-common \ + docker-latest \ + docker-latest-logrotate \ + docker-logrotate \ docker-selinux \ docker-engine-selinux \ - docker-engine + docker-engine \ + docker-ce ``` It's OK if `yum` reports that none of these packages are installed.