[meta-virtualization] [PATCH] docker: Add runtime provide for virtual-docker

[meta-virtualization] [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@arm.com>
---
 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

Re: [meta-virtualization] [PATCH] docker: Add runtime provide for virtual-docker

[Bruce Ashfield]

On Wed, May 4, 2022 at 10:09 AM Richard Neill <richard.neill@arm.com> wrote:
>
> 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).

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

>
> Signed-off-by: Richard Neill <richard.neill@arm.com>
> ---
>  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
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7241): https://lists.yoctoproject.org/g/meta-virtualization/message/7241
> Mute This Topic: https://lists.yoctoproject.org/mt/90888043/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

RE: [meta-virtualization] [PATCH] docker: Add runtime provide for virtual-docker

[Diego Sueiro]

Hi Bruce,

>-----Original Message-----
>From: meta-virtualization@lists.yoctoproject.org <meta-
>virtualization@lists.yoctoproject.org> On Behalf Of Bruce Ashfield via
>lists.yoctoproject.org
>Sent: 04 May 2022 15:27
>To: Richard Neill <Richard.Neill@arm.com>
>Cc: meta-virtualization@lists.yoctoproject.org; nd <nd@arm.com>
>Subject: Re: [meta-virtualization] [PATCH] docker: Add runtime provide for
>virtual-docker
>
>On Wed, May 4, 2022 at 10:09 AM Richard Neill <richard.neill@arm.com>
>wrote:
>>
>> 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).
>
>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.

In this case having ` PREFERRED_PROVIDER_virtual/docker ?= "docker-ce"` and ` PROVIDES += "virtual/docker"` is useless?

--
Diego

>
>Bruce
>
>>
>> Signed-off-by: Richard Neill <richard.neill@arm.com>
>> ---
>>  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
>>
>>
>>
>>
>
>
>--
>- Thou shalt not follow the NULL pointer, for chaos and madness await thee at
>its end
>- "Use the force Harry" - Gandalf, Star Trek II

RE: [meta-virtualization] [PATCH] docker: Add runtime provide for virtual-docker

[Diego Sueiro]

>-----Original Message-----
>From: meta-virtualization@lists.yoctoproject.org <meta-
>virtualization@lists.yoctoproject.org> On Behalf Of Diego Sueiro via
>lists.yoctoproject.org
>Sent: 04 May 2022 15:31
>To: bruce.ashfield@gmail.com; Richard Neill <Richard.Neill@arm.com>
>Cc: meta-virtualization@lists.yoctoproject.org; nd <nd@arm.com>
>Subject: Re: [meta-virtualization] [PATCH] docker: Add runtime provide for
>virtual-docker
>
>Hi Bruce,
>
>>-----Original Message-----
>>From: meta-virtualization@lists.yoctoproject.org <meta-
>>virtualization@lists.yoctoproject.org> On Behalf Of Bruce Ashfield via
>>lists.yoctoproject.org
>>Sent: 04 May 2022 15:27
>>To: Richard Neill <Richard.Neill@arm.com>
>>Cc: meta-virtualization@lists.yoctoproject.org; nd <nd@arm.com>
>>Subject: Re: [meta-virtualization] [PATCH] docker: Add runtime provide
>>for virtual-docker
>>
>>On Wed, May 4, 2022 at 10:09 AM Richard Neill <richard.neill@arm.com>
>>wrote:
>>>
>>> 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).
>>
>>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.
>
>In this case having ` PREFERRED_PROVIDER_virtual/docker ?= "docker-ce"` and
>` PROVIDES += "virtual/docker"` is useless?
>

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
>>
>>>
>>> Signed-off-by: Richard Neill <richard.neill@arm.com>
>>> ---
>>>  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
>>>
>>>
>>>
>>>
>>
>>
>>--
>>- Thou shalt not follow the NULL pointer, for chaos and madness await
>>thee at its end
>>- "Use the force Harry" - Gandalf, Star Trek II

Re: [meta-virtualization] [PATCH] docker: Add runtime provide for virtual-docker

[Bruce Ashfield]

On Wed, May 4, 2022 at 11:06 AM Diego Sueiro <Diego.Sueiro@arm.com> wrote:
>
> >-----Original Message-----
> >From: meta-virtualization@lists.yoctoproject.org <meta-
> >virtualization@lists.yoctoproject.org> On Behalf Of Diego Sueiro via
> >lists.yoctoproject.org
> >Sent: 04 May 2022 15:31
> >To: bruce.ashfield@gmail.com; Richard Neill <Richard.Neill@arm.com>
> >Cc: meta-virtualization@lists.yoctoproject.org; nd <nd@arm.com>
> >Subject: Re: [meta-virtualization] [PATCH] docker: Add runtime provide for
> >virtual-docker
> >
> >Hi Bruce,
> >
> >>-----Original Message-----
> >>From: meta-virtualization@lists.yoctoproject.org <meta-
> >>virtualization@lists.yoctoproject.org> On Behalf Of Bruce Ashfield via
> >>lists.yoctoproject.org
> >>Sent: 04 May 2022 15:27
> >>To: Richard Neill <Richard.Neill@arm.com>
> >>Cc: meta-virtualization@lists.yoctoproject.org; nd <nd@arm.com>
> >>Subject: Re: [meta-virtualization] [PATCH] docker: Add runtime provide
> >>for virtual-docker
> >>
> >>On Wed, May 4, 2022 at 10:09 AM Richard Neill <richard.neill@arm.com>
> >>wrote:
> >>>
> >>> 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).
> >>
> >>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.
> >
> >In this case having ` PREFERRED_PROVIDER_virtual/docker ?= "docker-ce"` and
> >` PROVIDES += "virtual/docker"` is useless?
> >
>
> 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.

It has been doing that for quite some time.

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

>
> Diego
>
>
> >
> >>
> >>Bruce
> >>
> >>>
> >>> Signed-off-by: Richard Neill <richard.neill@arm.com>
> >>> ---
> >>>  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
> >>>
> >>>
> >>>
> >>>
> >>
> >>
> >>--
> >>- Thou shalt not follow the NULL pointer, for chaos and madness await
> >>thee at its end
> >>- "Use the force Harry" - Gandalf, Star Trek II



-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Re: [meta-virtualization] [PATCH] docker: Add runtime provide for virtual-docker

[Richard Neill]

[-- Attachment #1: Type: text/plain, Size: 1644 bytes --]

Please also backport this patch to the honister branch if possible, thanks!

Richard
________________________________
From: meta-virtualization@lists.yoctoproject.org <meta-virtualization@lists.yoctoproject.org> on behalf of Richard Neill via lists.yoctoproject.org <richard.neill=arm.com@lists.yoctoproject.org>
Sent: Wednesday, May 4, 2022 3:09 PM
To: meta-virtualization@lists.yoctoproject.org <meta-virtualization@lists.yoctoproject.org>
Cc: nd <nd@arm.com>
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@arm.com>
---
 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


[-- Attachment #2: Type: text/html, Size: 2789 bytes --]