Skip to content

Commit c890d86

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 a2427ba commit c890d86

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
@@ -49,7 +49,8 @@ BuildRequires: git
4949
Conflicts: docker
5050
Conflicts: docker-io
5151
Conflicts: docker-engine-cs
52-
Conflicts: docker-ee
52+
Conflicts: docker-ce < 18.09
53+
Conflicts: docker-ee < 18.09
5354
Conflicts: docker-ee-cli
5455

5556
%description

0 commit comments

Comments
 (0)