Skip to content

docker-cli, docker-engine: remove outdated "conflicts #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 2 commits into from
May 10, 2024
Merged

docker-cli, docker-engine: remove outdated "conflicts #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f95006
docker-cli, docker-engine: remove "Conflicts: docker-engine-cs"
thaJeztah May 10, 2024
90fd9af
docker-cli, docker-engine: remove "Conflicts: lxc-docker, lxc-docker…
thaJeztah May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions pkg/docker-cli/deb/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ Recommends: docker-buildx-plugin,
docker-compose-plugin
Conflicts: docker (<< 1.5~),
docker-engine,
docker-engine-cs,
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
Expand Down
1 change: 0 additions & 1 deletion pkg/docker-cli/rpm/docker-ce-cli.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ BuildRequires: make

Conflicts: docker
Conflicts: docker-io
Conflicts: docker-engine-cs
Conflicts: docker-ee
Conflicts: docker-ee-cli

Expand Down
5 changes: 1 addition & 4 deletions pkg/docker-engine/deb/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ 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
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
Expand Down
1 change: 0 additions & 1 deletion pkg/docker-engine/rpm/docker-ce.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ BuildRequires: which

Conflicts: docker
Conflicts: docker-io
Conflicts: docker-engine-cs
Conflicts: docker-ee

Obsoletes: docker-ce-selinux
Expand Down