Merge pull request #555 from thaJeztah/compose_cli_package_dependencies

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

Author: thaJeztah

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,

rpm/SPECS/docker-ce-cli.spec

@@ -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

rpm/SPECS/docker-compose-plugin.spec

@@ -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