From 9c47bb08991fbc0f3d55a459e78e550c591bdb4f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Nov 2018 16:04:46 +0100 Subject: [PATCH] Remove containerd dependency from CLI The RPM packages list containerd as a hard dependency. While having containerd installed allows certain features (e.g., allow you to run `docker engine activate`), this should not be a requirement for installing the Docker CLI, as it limits the use of this package for situations where the CLI is installed to connect to a remote daemon. This patch removes the containerd dependency from the RPM packages (the deb packages don't have this dependency, so no change is needed in those packages) Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 037349c5dc3f18d3bea3be0217e249f716a8be25) Signed-off-by: Sebastiaan van Stijn Signed-off-by: Eli Uriegas Upstream-commit: bc3867a8f6e59c56c967720c33c6ce9a65b64b7b Component: packaging --- components/packaging/rpm/SPECS/docker-ce-cli.spec | 1 - components/packaging/rpm/SPECS/docker-ce.spec | 1 - 2 files changed, 2 deletions(-) diff --git a/components/packaging/rpm/SPECS/docker-ce-cli.spec b/components/packaging/rpm/SPECS/docker-ce-cli.spec index d5b89a45fa..cc130e4adb 100644 --- a/components/packaging/rpm/SPECS/docker-ce-cli.spec +++ b/components/packaging/rpm/SPECS/docker-ce-cli.spec @@ -14,7 +14,6 @@ Packager: Docker # required packages on install Requires: /bin/sh -Requires: containerd BuildRequires: make BuildRequires: libtool-ltdl-devel diff --git a/components/packaging/rpm/SPECS/docker-ce.spec b/components/packaging/rpm/SPECS/docker-ce.spec index f5ab519f41..2d8b0d6033 100644 --- a/components/packaging/rpm/SPECS/docker-ce.spec +++ b/components/packaging/rpm/SPECS/docker-ce.spec @@ -19,7 +19,6 @@ Requires: libseccomp >= 2.3 Requires: systemd-units Requires: iptables Requires: libcgroup -# Should be required as well by docker-ce-cli but let's just be thorough Requires: containerd.io Requires: tar Requires: xz