Date
1 - 6 of 6
[PATCH] docker: Add runtime provide for virtual-docker
|
Richard Neill
This patch enables successful runtime-dependency on the Docker preferred
provider, as virtual/docker does not resolve. Doing so aligns with other = virtual package providers (e.g. virtual-runc), and follows the Yocto Project documentation (https://docs.yoctoproject.org/singleindex.html#virtual-runtime-provides)= . Signed-off-by: Richard Neill <richard.neill@...> --- recipes-containers/docker/docker.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/do= cker/docker.inc index 40a3642..e196f9b 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc @@ -32,6 +32,7 @@ RDEPENDS:${PN} +=3D "virtual-containerd virtual-runc" RRECOMMENDS:${PN} =3D "kernel-module-dm-thin-pool kernel-module-nf-nat k= ernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module= -xt-masquerade" PROVIDES +=3D "virtual/docker" +RPROVIDES:${PN} +=3D "virtual-docker" # we want all the docker variant recpes to be installable via "docker" PACKAGE_NAME =3D "docker" -- 2.25.1
|
|
|
|
Richard Neill
Please also backport this patch to the honister branch if possible, thanks!
From: meta-virtualization@... <meta-virtualization@...> on behalf of Richard Neill via lists.yoctoproject.org
<richard.neill=arm.com@...>
Sent: Wednesday, May 4, 2022 3:09 PM To: meta-virtualization@... <meta-virtualization@...> Cc: nd <nd@...> Subject: [meta-virtualization] [PATCH] docker: Add runtime provide for virtual-docker This patch enables successful runtime-dependency on the Docker preferred
provider, as virtual/docker does not resolve. Doing so aligns with other virtual package providers (e.g. virtual-runc), and follows the Yocto Project documentation (https://docs.yoctoproject.org/singleindex.html#virtual-runtime-provides). Signed-off-by: Richard Neill <richard.neill@...> --- recipes-containers/docker/docker.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc index 40a3642..e196f9b 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc @@ -32,6 +32,7 @@ RDEPENDS:${PN} += "virtual-containerd virtual-runc" RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade" PROVIDES += "virtual/docker" +RPROVIDES:${PN} += "virtual-docker" # we want all the docker variant recpes to be installable via "docker" PACKAGE_NAME = "docker" -- 2.25.1
|
|
|
|
Bruce Ashfield
On Wed, May 4, 2022 at 10:09 AM Richard Neill <richard.neill@...> wrote:
We don't have a virtual-docker rprovides by design. Since there are differences (historically) between docker-ce and docker-moby. Your package lists and images should be referring to the one they want, not virtual-docker as a rdepends. Bruce
-- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
|
|
|
|
Diego Sueiro
Hi Bruce,
toggle quoted messageShow quoted text
-----Original Message-----In this case having ` PREFERRED_PROVIDER_virtual/docker ?= "docker-ce"` and ` PROVIDES += "virtual/docker"` is useless? -- Diego
|
|
|
|
Diego Sueiro
toggle quoted messageShow quoted text
-----Original Message-----Also, it seems that on the browser github.com/docker/docker.git (from docker-ce_git.bb) redirects to github.com/moby/moby.git. Does it not make sense to retire one of the recipes and just keep one? It will reduce maintenance effort and avoid confusions to which one should be used. Diego
|
|
|
|
Bruce Ashfield
On Wed, May 4, 2022 at 11:06 AM Diego Sueiro <Diego.Sueiro@...> wrote:
It has been doing that for quite some time.-----Original Message-----Also, it seems that on the browser github.com/docker/docker.git (from docker-ce_git.bb) redirects to github.com/moby/moby.git. We'll keep the two. There are some patch differences, and update cadences that differ between the two. docker has moved closer to moby, but we don't always want the docker-ce curated git hashes. Bruce
-- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
|
|
|