Skip to content

Commit

Permalink
rpm: recommend, not require "docker-ce-rootless-extras" where possible
Browse files Browse the repository at this point in the history
The deb pacakges have this dependency as "recommends", but older versions
of yum (RHEL7 / CentOS 7) do not support this. and only support "requires".

This patch uses a similar approach as bb4bd31
did for the CLI, and changes the dependency to be "recommends" where possible,
falling back to "requires" for older rpm versions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Sep 20, 2023
1 parent 6f66145 commit cfee3a6
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions rpm/SPECS/docker-ce.spec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,15 @@ Packager: Docker <support@docker.com>

Requires: /usr/sbin/groupadd
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
Requires: docker-ce-rootless-extras
%else
Recommends: docker-ce-rootless-extras
%endif
Requires: container-selinux >= 2:2.74
Requires: libseccomp >= 2.3
Requires: systemd
Expand Down

0 comments on commit cfee3a6

Please sign in to comment.