From 8f95006be4f25e62f527264de558917d7c2283b4 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 10 May 2024 16:10:31 +0200 Subject: [PATCH 1/2] docker-cli, docker-engine: remove "Conflicts: docker-engine-cs" This was added in [docker@a15b67b1affb2eac5365614e55703f43b6f73e9b] (2015), at which time this package was already deprecated / replaced: > Add old docker-engine-cs name to package conflicts [docker@a15b67b1affb2eac5365614e55703f43b6f73e9b]: https://github.com/moby/moby/commit/a15b67b1affb2eac5365614e55703f43b6f73e9b Signed-off-by: Sebastiaan van Stijn --- pkg/docker-cli/deb/control | 1 - pkg/docker-cli/rpm/docker-ce-cli.spec | 1 - pkg/docker-engine/deb/control | 1 - pkg/docker-engine/rpm/docker-ce.spec | 1 - 4 files changed, 4 deletions(-) diff --git a/pkg/docker-cli/deb/control b/pkg/docker-cli/deb/control index 86aa12a1..b36ffec6 100644 --- a/pkg/docker-cli/deb/control +++ b/pkg/docker-cli/deb/control @@ -20,7 +20,6 @@ Recommends: docker-buildx-plugin, docker-compose-plugin Conflicts: docker (<< 1.5~), docker-engine, - docker-engine-cs, docker.io, lxc-docker, lxc-docker-virtual-package diff --git a/pkg/docker-cli/rpm/docker-ce-cli.spec b/pkg/docker-cli/rpm/docker-ce-cli.spec index 3fab6249..a61d4414 100644 --- a/pkg/docker-cli/rpm/docker-ce-cli.spec +++ b/pkg/docker-cli/rpm/docker-ce-cli.spec @@ -33,7 +33,6 @@ BuildRequires: make Conflicts: docker Conflicts: docker-io -Conflicts: docker-engine-cs Conflicts: docker-ee Conflicts: docker-ee-cli diff --git a/pkg/docker-engine/deb/control b/pkg/docker-engine/deb/control index 1505fe8c..2734e37e 100644 --- a/pkg/docker-engine/deb/control +++ b/pkg/docker-engine/deb/control @@ -38,7 +38,6 @@ Recommends: apparmor, Suggests: aufs-tools [amd64], cgroupfs-mount | cgroup-lite Conflicts: docker (<< 1.5~), docker-engine, - docker-engine-cs, docker.io, lxc-docker, lxc-docker-virtual-package diff --git a/pkg/docker-engine/rpm/docker-ce.spec b/pkg/docker-engine/rpm/docker-ce.spec index 45ef5e83..00ac31ce 100644 --- a/pkg/docker-engine/rpm/docker-ce.spec +++ b/pkg/docker-engine/rpm/docker-ce.spec @@ -57,7 +57,6 @@ BuildRequires: which Conflicts: docker Conflicts: docker-io -Conflicts: docker-engine-cs Conflicts: docker-ee Obsoletes: docker-ce-selinux From 90fd9afee6fd89ddcfb239afdd62827c2f1017be Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 10 May 2024 16:12:17 +0200 Subject: [PATCH 2/2] docker-cli, docker-engine: remove "Conflicts: lxc-docker, lxc-docker-virtual-package" These conflicts were added as part of the first implementation of the deb packaging scripts in [docker@eee1efcfd6c46dbdc5da02ca12722e399a56bb12] (2015) to replace the old packages. These packages where part of the old PPA at get.docker.io (see [1], [2]), which is long gone; curl -I https://get.docker.io/ubuntu HTTP/1.1 301 Moved Permanently content-length: 0 location: https://get.docker.com/ubuntu curl -fsSL https://get.docker.com/ubuntu echo "# WARNING! This script is deprecated. Please use the script" echo "# at https://get.docker.com/" exit 1 [docker@eee1efcfd6c46dbdc5da02ca12722e399a56bb12]: https://github.com/moby/moby/commit/eee1efcfd6c46dbdc5da02ca12722e399a56bb12 [2]: https://www.ubuntuupdates.org/package/docker/docker/main/base/lxc-docker [3]: https://www.ubuntuupdates.org/ppa/docker?dist=docker Signed-off-by: Sebastiaan van Stijn --- pkg/docker-cli/deb/control | 4 +--- pkg/docker-engine/deb/control | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/docker-cli/deb/control b/pkg/docker-cli/deb/control index b36ffec6..49ed81b6 100644 --- a/pkg/docker-cli/deb/control +++ b/pkg/docker-cli/deb/control @@ -20,9 +20,7 @@ Recommends: docker-buildx-plugin, docker-compose-plugin Conflicts: docker (<< 1.5~), docker-engine, - docker.io, - lxc-docker, - lxc-docker-virtual-package + docker.io Replaces: docker-ce (<< 5:0) Breaks: docker-ce (<< 5:0) Description: Docker CLI: the open-source application container engine diff --git a/pkg/docker-engine/deb/control b/pkg/docker-engine/deb/control index 2734e37e..bca3ff62 100644 --- a/pkg/docker-engine/deb/control +++ b/pkg/docker-engine/deb/control @@ -38,9 +38,7 @@ Recommends: apparmor, Suggests: aufs-tools [amd64], cgroupfs-mount | cgroup-lite Conflicts: docker (<< 1.5~), docker-engine, - docker.io, - lxc-docker, - lxc-docker-virtual-package + docker.io Replaces: docker-engine Description: Docker: the open-source application container engine Docker is a product for you to build, ship and run any application as a