Skip to content

deb: update "conflicts"#1328

Merged
vvoland merged 3 commits into
docker:masterfrom
thaJeztah:update_conflicts
Jun 11, 2026
Merged

deb: update "conflicts"#1328
vvoland merged 3 commits into
docker:masterfrom
thaJeztah:update_conflicts

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

deb: remove "conflicts: docker-engine"

The docker-engine package pre-dates docker-ce (< 17.03), and this
package was never published to download.docker.com, so is very
unlikely to be found anywhere.

deb: remove "conflicts: docker"

The docker package is now a transitional package with a dependency
on wmdocker, and the docker package was removed entirely since
Debian 13 (trixy) and Ubuntu 22.10

Neither have a binary named docker, or docs that conflict;

So we don't have any conflicts if both would be installed.

deb: conflict with docker-cli packages

Debian Trixie now ships the Docker CLI as a separate docker-cli package,
while Ubuntu and older Debian releases include it in docker.io.

Add a conflict with docker-cli to prevent file overlaps with the CLI
binaries provided by docker-ce-cli.

- Description for the changelog

The docker-engine package pre-dates docker-ce (< 17.03), and this
package was never published to download.docker.com, so is very
unlikely to be found anywhere.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The `docker` package is now a transitional package with a dependency
on `wmdocker`, and the `docker` package was removed entirely since
Debian 13 (trixy) and Ubuntu 22.10

- https://packages.debian.org/bullseye/docker
- https://packages.debian.org/bullseye/wmdocker

Neither have a binary named `docker`, or docs that conflict;

- https://packages.debian.org/bookworm/amd64/docker/filelist
- https://packages.debian.org/bookworm/amd64/wmdocker/filelist

So we don't have any conflicts if both would be installed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Debian Trixie now ships the Docker CLI as a separate docker-cli package,
while Ubuntu and older Debian releases include it in docker.io.

Add a conflict with docker-cli to prevent file overlaps with the CLI
binaries provided by docker-ce-cli.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah requested review from crazy-max and vvoland June 10, 2026 12:14
@vvoland vvoland merged commit b4487ff into docker:master Jun 11, 2026
39 checks passed
@thaJeztah thaJeztah deleted the update_conflicts branch June 11, 2026 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants