[master] rpm: fix circular dependency between scan-cli-plugin and docker-ce-cli#657
Merged
Merged
Conversation
thaJeztah
commented
Mar 27, 2022
| Packager: Docker <[email protected]> | ||
|
|
||
| Requires: docker-ce-cli | ||
| Enhances: docker-ce-cli |
Member
Author
There was a problem hiding this comment.
Only thinking if this should be set conditional as well (not sure if older versions just ignore it, or if they would warn/complain), i.e.;
Suggested change
| Enhances: docker-ce-cli | |
| # CentOS 7 and RHEL 7 do not yet support weak dependencies | |
| %if 0%{?rhel} != 7 | |
| Enhances: docker-ce-cli | |
| %endif |
Member
Author
There was a problem hiding this comment.
ok; looks like this is needed
error: line 15: Unknown tag: Enhances: docker-ce-cli
thaJeztah
commented
Mar 27, 2022
| # TODO change once we support scan-plugin on other architectures | ||
| %ifarch x86_64 | ||
| # CentOS 7 and RHEL 7 do not yet support weak dependencies | ||
| %if 0%{?rhel} == 7 |
Member
Author
There was a problem hiding this comment.
note that I'm specifically not using < or > here, as rhel won't be / may not be defined on other RPM platforms, in which case 0 (default) is picked
Member
Author
There was a problem hiding this comment.
^^ added a note about that in the comment to prevent someone accidentally changing it
Member
Author
There was a problem hiding this comment.
I only hope this will always be 7 and not 7.1 (e.g.) on CentOS / RHEL 🤔
crazy-max
reviewed
Mar 27, 2022
| # TODO change once we support scan-plugin on other architectures | ||
| %ifarch x86_64 | ||
| # CentOS 7 and RHEL 7 do not yet support weak dependencies | ||
| %if 0%{?rhel} == 7 |
Member
There was a problem hiding this comment.
Suggested change
| %if 0%{?rhel} == 7 | |
| %if ! (0%{?rhel} && 0%{?rhel} < 7) |
Member
There was a problem hiding this comment.
Actually your cond looks right.
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]>
thaJeztah
force-pushed
the
fix_scan_dependency
branch
from
March 27, 2022 11:36
70fd056 to
51098f9
Compare
crazy-max
approved these changes
Mar 27, 2022
crazy-max
left a comment
crazy-max
left a comment
Member
There was a problem hiding this comment.
LGTM
Resolving Dependencies
--> Running transaction check
---> Package docker-ce-cli.x86_64 1:22.04.0-3.el7 will be installed
--> Processing Dependency: docker-scan-plugin(x86-64) for package: 1:docker-ce-cli-22.04.0-3.el7.x86_64
--> Running transaction check
---> Package docker-scan-plugin.x86_64 0:0.17.0-3.el7 will be installed
--> Finished Dependency Resolution
Dependencies Resolved
========================================================================================================================================================================================================== Package Arch Version Repository Size
==========================================================================================================================================================================================================Installing:
docker-ce-cli x86_64 1:22.04.0-3.el7 docker-test 18 M
Installing for dependencies:
docker-scan-plugin x86_64 0.17.0-3.el7 docker-test 3.7 M
Transaction Summary
==========================================================================================================================================================================================================Install 1 Package (+1 Dependent package)
Total download size: 22 M
Installed size: 96 M
Is this ok [y/d/N]: y
Downloading packages:
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------Total 410 MB/s | 22 MB 00:00:00
Running transaction check
Running transaction test
Transaction test succeeded
Running transaction
Installing : docker-scan-plugin-0.17.0-3.el7.x86_64 1/2
Installing : 1:docker-ce-cli-22.04.0-3.el7.x86_64 2/2
Verifying : 1:docker-ce-cli-22.04.0-3.el7.x86_64 1/2
Verifying : docker-scan-plugin-0.17.0-3.el7.x86_64 2/2
Installed:
docker-ce-cli.x86_64 1:22.04.0-3.el7
Dependency Installed:
docker-scan-plugin.x86_64 0:0.17.0-3.el7
Complete!
Member
Author
|
Whoop! Let's get this one in |
Member
Author
|
We should probably cherry-pick this one as well |
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
2 participants
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.
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.