[WIP] CLI RPM: only conflict with older engine packages #271
+2
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@andrewhsu @seemethere I opened this for discussion, and marked it "WIP", because I wasn't sure what version format to use 😅 (e.g. if the EPOCH is needed etc) |
|
Actually, this may not work, because the engine is specific about ce/ee, and marks |
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 <github@gone.nl>
thaJeztah
force-pushed
the
fine_grain_conflicts
branch
from
8c76ca7
to
c890d86
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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).
Also see https://fedoraproject.org/wiki/Packaging:Conflicts#Splitting_Packages