Skip to content

Commit 8c76ca7

Browse files
committed
CLI RPM: only conflict with older engine packages
Engine packages 18.09 and up no longer contain the CLI (as it is split to a separate package), so we can limit the conflict to older packages. This change should allow users to install a Docker CE CLI on a host that has Docker EE Engine 18.09, or vice-versa (an EE CLI on a host that has Docker CE Engine 18.09). Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 114582c commit 8c76ca7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

rpm/SPECS/docker-ce-cli.spec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ BuildRequires: libtool-ltdl-devel
2323
Conflicts: docker
2424
Conflicts: docker-io
2525
Conflicts: docker-engine-cs
26-
Conflicts: docker-ee
26+
Conflicts: docker-ce < 18.09
27+
Conflicts: docker-ee < 18.09
2728
Conflicts: docker-ee-cli
2829

2930
# Obsolete packages

0 commit comments

Comments
 (0)