From 99e41304444ddf38d8ee3f8bb1436341f5f9e8c5 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Mon, 15 Oct 2018 21:11:54 +0000 Subject: [PATCH 1/4] Change replaces/breaks to have compat with nightly Nightly builds wouldn't install correctly since our versioning scheme for nightly builds is 0.0.0~ and 0 < 18. Should be backwards compatible with 18.09 builds so there's no need to actually backport this to 18.09. Signed-off-by: Eli Uriegas (cherry picked from commit de312224beff9c6bc7fd6def46459d531cf2ce4a) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 3e383bee967aa07d35ea717544bc18aafbbad4f7 Component: packaging --- components/packaging/deb/common/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/packaging/deb/common/control b/components/packaging/deb/common/control index 46f53b4175..4dbded6476 100644 --- a/components/packaging/deb/common/control +++ b/components/packaging/deb/common/control @@ -42,8 +42,8 @@ Package: docker-ce-cli Architecture: linux-any Depends: ${shlibs:Depends} Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine, docker-engine-cs -Replaces: docker-ce (<< 5:18.09) -Breaks: docker-ce (<< 5:18.09) +Replaces: docker-ce (<< 5:0) +Breaks: docker-ce (<< 5:0) Description: Docker CLI: the open-source application container engine Docker is a product for you to build, ship and run any application as a lightweight container From 85e1aa53ceef00cef962cad1695585992bdbd175 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Nov 2018 15:22:19 +0100 Subject: [PATCH 2/4] Add libseccomp requirement for rpm packages This requirement was originally added in 86f76496ce33bd6eff1737348bc44add4723ddd2, but got removed in the migration to the new image-based packaging. Commit f2ceca98823548e401c6cca125b7057df28c4892 added this requirement back for `.deb` packages, but did not include the same changes for RPMs. This patch adds back the requirement for RPM packages as well. Signed-off-by: Sebastiaan van Stijn Upstream-commit: 86ed6eb2cef4e7386979fc73397c1844531eb3a9 Component: packaging --- components/packaging/rpm/SPECS/docker-ce.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/components/packaging/rpm/SPECS/docker-ce.spec b/components/packaging/rpm/SPECS/docker-ce.spec index 062c374adb..35b22b5aba 100644 --- a/components/packaging/rpm/SPECS/docker-ce.spec +++ b/components/packaging/rpm/SPECS/docker-ce.spec @@ -15,6 +15,7 @@ Packager: Docker Requires: docker-ce-cli Requires: container-selinux >= 2.9 +Requires: libseccomp >= 2.3 Requires: systemd-units Requires: iptables # Should be required as well by docker-ce-cli but let's just be thorough From 60a25b4d26dac06c7aae19a792774b4084c4ab94 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Nov 2018 15:44:43 +0100 Subject: [PATCH 3/4] Add back requirements that were removed in the migration During the migration to "image based builds", some dependencies were removed. This patch brings back those dependencies. Signed-off-by: Sebastiaan van Stijn Upstream-commit: a6ff66f1a51af62c9fd17a8b931f8a9b0283247a Component: packaging --- components/packaging/rpm/SPECS/docker-ce.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/packaging/rpm/SPECS/docker-ce.spec b/components/packaging/rpm/SPECS/docker-ce.spec index 062c374adb..23fabe8d04 100644 --- a/components/packaging/rpm/SPECS/docker-ce.spec +++ b/components/packaging/rpm/SPECS/docker-ce.spec @@ -17,8 +17,14 @@ Requires: docker-ce-cli Requires: container-selinux >= 2.9 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 + +# Resolves: rhbz#1165615 +Requires: device-mapper-libs >= 1.02.90-1 BuildRequires: which BuildRequires: make From 9c47bb08991fbc0f3d55a459e78e550c591bdb4f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Nov 2018 16:04:46 +0100 Subject: [PATCH 4/4] 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