Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.10 backport] rpm: fix circular dependency between scan-cli-plugin and docker-ce-cli #659

Merged
merged 1 commit into from May 10, 2022
+15 −1
Merged

[20.10 backport] rpm: fix circular dependency between scan-cli-plugin and docker-ce-cli #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions rpm/SPECS/docker-ce-cli.spec
View file
Open in desktop
Expand Up @@ -18,7 +18,15 @@ Requires: /bin/sh
Requires: /usr/sbin/groupadd
# TODO change once we support scan-plugin on other architectures
%ifarch x86_64
# CentOS 7 and RHEL 7 do not yet support weak dependencies
#
# Note that we're not using <= 7 here, to account for other RPM distros, such
# as Fedora, which would not have the rhel macro set (so default to 0).
%if 0%{?rhel} == 7
Requires: docker-scan-plugin(x86-64)
%else
Recommends: docker-scan-plugin(x86-64)
%endif
%endif

BuildRequires: make
Expand Down
8 changes: 7 additions & 1 deletion rpm/SPECS/docker-scan-plugin.spec
View file
Open in desktop
Expand Up @@ -12,7 +12,13 @@ URL: https://github.com/docker/scan-cli-plugin/
Vendor: Docker
Packager: Docker <support@docker.com>

Requires: docker-ce-cli
# CentOS 7 and RHEL 7 do not yet support weak dependencies.
#
# Note that we're not using <= 7 here, to account for other RPM distros, such
# as Fedora, which would not have the rhel macro set (so default to 0).
%if 0%{?rhel} != 7
Enhances: docker-ce-cli
%endif

# TODO change once we support scan-plugin on other architectures
BuildArch: x86_64
Expand Down