diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-04-29 22:48:41 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-04-29 22:48:41 -0400 |
commit | 31ab8a78b44817916b79e05694b6f9e566893edb (patch) | |
tree | c958b46276bb98c21f641d7eb5ffc8065d7fcd7b | |
parent | 9d98a04b2646cfc1db9dc36e628ebdced7cff2d9 (diff) | |
download | meta-virtualization-31ab8a78b44817916b79e05694b6f9e566893edb.tar.gz |
docker: introduce -clie package
By the docker-packaging repository and https://docs.docker.com/engine/install/centos/#installation-methods
docker is packaged by most distros with a split between the engine and the CLI.
We do the same here, by introducing the -cli package
But to keep existing use cases working, we also create a RDEPENDS between the main
docker package (the engine) and the cli, so existing "docker" package installs will
continue to work the same way. To have separate and non-redepending packages created
set the DOCKER_UNIFIED_PACKAGE variable to False
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-containers/docker/docker.inc | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc index a011366f..cd4d27b9 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc | |||
@@ -158,3 +158,21 @@ FILES_${PN} += "${systemd_unitdir}/system/* ${sysconfdir}/docker" | |||
158 | PACKAGES =+ "${PN}-contrib" | 158 | PACKAGES =+ "${PN}-contrib" |
159 | FILES_${PN}-contrib += "${datadir}/docker/check-config.sh" | 159 | FILES_${PN}-contrib += "${datadir}/docker/check-config.sh" |
160 | RDEPENDS_${PN}-contrib += "bash" | 160 | RDEPENDS_${PN}-contrib += "bash" |
161 | |||
162 | # By the docker-packaging repository and https://docs.docker.com/engine/install/centos/#installation-methods | ||
163 | # docker is packaged by most distros with a split between the engine and the CLI. | ||
164 | # | ||
165 | # We do the same here, by introducing the -cli package | ||
166 | # | ||
167 | # But to keep existing use cases working, we also create a RDEPENDS between the main | ||
168 | # docker package (the engine) and the cli, so existing "docker" package installs will | ||
169 | # continue to work the same way. To have separate and non-redepending packages created | ||
170 | # set the DOCKER_UNIFIED_PACKAGE variable to False | ||
171 | # | ||
172 | PACKAGES =+ "${PN}-cli" | ||
173 | FILES_${PN}-cli += "${bindir}/docker" | ||
174 | |||
175 | # set to "False" if packages should be generated for the cli and engine, and | ||
176 | # NOT rdepend to get a classic one-package install | ||
177 | DOCKER_UNIFIED_PACKAGE ?= "True" | ||
178 | RDEPENDS_${PN} += "${@bb.utils.contains("DOCKER_UNIFIED_PACKAGE", "True", "${PN}-cli", "", d)}" | ||