Skip to content

[master] deb/rpm define dependencies between docker-ce-cli and docker-compose-plugin #555

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

Merged
thaJeztah merged 2 commits into from
Mar 27, 2022
Merged

[master] deb/rpm define dependencies between docker-ce-cli and docker-compose-plugin #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6baa8b
deb: add docker-compose-plugin as "recommends"
thaJeztah Jul 3, 2021
bb4bd31
rpm: add docker-compose-plugin as "recommends" / "requires"
thaJeztah Jul 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion deb/common/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ Package: docker-ce-cli
Architecture: linux-any
Depends: ${shlibs:Depends}
# TODO change once we support scan-plugin on other architectures
Recommends: docker-scan-plugin [amd64]
Recommends: docker-compose-plugin,
docker-scan-plugin [amd64]
Conflicts: docker (<< 1.5~),
docker-engine,
docker-engine-cs,
Expand Down
11 changes: 11 additions & 0 deletions rpm/SPECS/docker-ce-cli.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ Packager: Docker <[email protected]>
# required packages on install
Requires: /bin/sh
Requires: /usr/sbin/groupadd

# 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-compose-plugin
%else
Recommends: docker-compose-plugin
%endif

# TODO change once we support scan-plugin on other architectures
%ifarch x86_64
# CentOS 7 and RHEL 7 do not yet support weak dependencies
Expand Down
8 changes: 8 additions & 0 deletions rpm/SPECS/docker-compose-plugin.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ URL: https://github.com/docker/compose/
Vendor: Docker
Packager: Docker <[email protected]>

# 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

BuildRequires: bash

%description
Expand Down