diff --git a/deb/common/control b/deb/common/control index a9cd38b1ed..c74791decf 100644 --- a/deb/common/control +++ b/deb/common/control @@ -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, diff --git a/rpm/SPECS/docker-ce-cli.spec b/rpm/SPECS/docker-ce-cli.spec index 254c2f4390..e9e55f25e3 100644 --- a/rpm/SPECS/docker-ce-cli.spec +++ b/rpm/SPECS/docker-ce-cli.spec @@ -16,6 +16,17 @@ Packager: Docker # 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 diff --git a/rpm/SPECS/docker-compose-plugin.spec b/rpm/SPECS/docker-compose-plugin.spec index a4a583a0bf..017c3fb6d5 100644 --- a/rpm/SPECS/docker-compose-plugin.spec +++ b/rpm/SPECS/docker-compose-plugin.spec @@ -12,6 +12,14 @@ URL: https://github.com/docker/compose/ Vendor: Docker Packager: Docker +# 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