[20.10 backport] rpm: fix circular dependency between scan-cli-plugin and docker-ce-cli#659
Merged
thaJeztah merged 1 commit intoMay 10, 2022
Conversation
This fixes a problem when installing the packages from local files instead of
from the package repository. The current packages had a strong dependency set
in both directions (`docker-ce-cli` requires `docker-scan-plugin`, and vice-
versa). This caused a circular dependency, which could not be resolved when
trying to install the packages offline (from downloaded rpm files);
yum install ./docker-scan-plugin-0.17.0-3.fc35.x86_64.rpm
Last metadata expiration check: 1:09:40 ago on Tue Mar 8 08:30:47 2022.
Error:
Problem: conflicting requests
- nothing provides docker-ce-cli needed by docker-scan-plugin-0.17.0-3.fc35.x86_64
(try to add '--skip-broken' to skip uninstallable packages)
yum install ./docker-ce-cli-20.10.13-3.fc35.x86_64.rpm
Last metadata expiration check: 1:10:23 ago on Tue Mar 8 08:30:47 2022.
Error:
Problem: conflicting requests
- nothing provides docker-scan-plugin(x86-64) needed by docker-ce-cli-1:20.10.13-3.fc35.x86_64
(try to add '--skip-broken' to skip uninstallable packages)
This patch
- changes the `docker-scan-plugin` to `Enhances
- changes the `docker-ce-cli` package to mark the scan plugin as `Recommends`,
with the exception of CentOS/RHEL 7, which do not yet support weak dependencies.
For those, we continue to use `Requires`.
The `Recommends` dependency should be installed by default, but users can opt-out
by passing `--setopt=install_weak_deps=False` to `dnf`.
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 51098f9)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
marked this pull request as ready for review
May 10, 2022 07:22
rumpl
approved these changes
May 10, 2022
Member
Author
|
thanks! |
This file contains hidden or 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
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.
backport of #657
This fixes a problem when installing the packages from local files instead of
from the package repository. The current packages had a strong dependency set
in both directions (
docker-ce-clirequiresdocker-scan-plugin, and vice-versa). This caused a circular dependency, which could not be resolved when
trying to install the packages offline (from downloaded rpm files);
This patch
docker-scan-pluginto `Enhancesdocker-ce-clipackage to mark the scan plugin asRecommends,with the exception of CentOS/RHEL 7, which do not yet support weak dependencies.
For those, we continue to use
Requires.The
Recommendsdependency should be installed by default, but users can opt-outby passing
--setopt=install_weak_deps=Falsetodnf.Signed-off-by: Sebastiaan van Stijn [email protected]
(cherry picked from commit 51098f9)
Signed-off-by: Sebastiaan van Stijn [email protected]