Re: [PATCH] docker: update 18.09.0 -> 18.09.2

["Hongzhi, Song" <hongzhi.song@windriver.com>]

On 2/20/19 9:47 PM, Bruce Ashfield wrote:
> On Wed, Feb 20, 2019 at 8:42 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>> On Wed, Feb 20, 2019 at 8:06 AM Pascal Bach <pascal.bach@siemens.com> wrote:
>>> Docker revision is taken from https://github.com/docker/engine/releases/tag/v18.09.2
>>> and libnetwork is extracted from there.
>>> I also switched the repo from moby/moby to docker/engine as it makes it easier to find the tags.
>> In this case, I'm going to stick with moby. The reason that it was
>> being used was
>> to keep the linkage between moby and the -ce builds. Since we have various other
>> components that are sometimes in sync, sometimes out of sync, having that common
>> repository was important. The point of having the docker-ce and
>> 'docker' split was
>> that one tracked community, and one only tracks what docker "the
>> company" was doing.
> The formatting of that email came out horribly. Sorry about that.
> (let's see if this one comes out more readable)
>
> I thought I should add that I'm working on a refresh of the docker
> components as well, and was considering using some naming to make the
> community/docker-ce split a bit more clear.

Hi Bruce,

Could I uprev docker to v18.09.3 compliant with moby?


Hongzhi


> So perhaps that would help
> make hunting for the right SRCREV in moby make a bit more sense.
>
> Bruce
>
>> Bruce
>>
>>> What is odd is that the Copyright year in LICENSE went backwards in this release.
>>>
>>> I didn't touch runc and containerd as they are already updated.
>>>
>>> Cc: Bruce Ashfield <bruce.ashfield@gmail.com>
>>> Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
>>> ---
>>>   recipes-containers/docker/docker-ce_git.bb |  6 +++---
>>>   recipes-containers/docker/docker_git.bb    | 12 ++++++------
>>>   2 files changed, 9 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
>>> index 05eac21..5e9f060 100644
>>> --- a/recipes-containers/docker/docker-ce_git.bb
>>> +++ b/recipes-containers/docker/docker-ce_git.bb
>>> @@ -18,8 +18,8 @@ DESCRIPTION = "Linux container runtime \
>>>    subtle and/or glaring issues. \
>>>    "
>>>
>>> -SRCREV_docker = "6e632f7fc395d15bce46f426086e91c01598cf59"
>>> -SRCREV_libnetwork = "6da50d1978302f04c3e2089e29112ea24812f05b"
>>> +SRCREV_docker = "62479626f213818ba5b4565105a05277308587d5"
>>> +SRCREV_libnetwork = "2cfbf9b1f98162a55829a21cc603c76072a75382"
>>>   SRC_URI = "\
>>>          git://github.com/docker/docker-ce.git;branch=18.09;name=docker \
>>>          git://github.com/docker/libnetwork.git;branch=bump_18.09;name=libnetwork;destsuffix=git/libnetwork \
>>> @@ -34,7 +34,7 @@ GO_IMPORT = "import"
>>>
>>>   S = "${WORKDIR}/git"
>>>
>>> -DOCKER_VERSION = "18.09.0-ce"
>>> +DOCKER_VERSION = "18.09.2-ce"
>>>   PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
>>>
>>>   DEPENDS = " \
>>> diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
>>> index 19e773b..5a0e483 100644
>>> --- a/recipes-containers/docker/docker_git.bb
>>> +++ b/recipes-containers/docker/docker_git.bb
>>> @@ -18,11 +18,11 @@ DESCRIPTION = "Linux container runtime \
>>>    subtle and/or glaring issues. \
>>>    "
>>>
>>> -SRCREV_docker = "489b8eda6674523df8b82a210399b7d2954427d0"
>>> -SRCREV_libnetwork = "6da50d1978302f04c3e2089e29112ea24812f05b"
>>> -SRCREV_cli = "51668a30f26250ccfce31bcc13d9334eaafabe36"
>>> +SRCREV_docker = "eb137ff1765faeb29c2d99025bfd8ed41836dd06"
>>> +SRCREV_libnetwork = "2cfbf9b1f98162a55829a21cc603c76072a75382"
>>> +SRCREV_cli = "af2647d55b1dff69f5684f5991b9690fddd75c69"
>>>   SRC_URI = "\
>>> -       git://github.com/moby/moby.git;nobranch=1;name=docker \
>>> +       git://github.com/docker/engine.git;nobranch=1;name=docker \
>>>          git://github.com/docker/libnetwork.git;branch=bump_18.09;name=libnetwork;destsuffix=git/libnetwork \
>>>          git://github.com/docker/cli;branch=18.09;name=cli;destsuffix=git/cli \
>>>          file://docker.init \
>>> @@ -31,13 +31,13 @@ SRC_URI = "\
>>>
>>>   # Apache-2.0 for docker
>>>   LICENSE = "Apache-2.0"
>>> -LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4859e97a9c7780e77972d989f0823f28"
>>> +LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=9740d093a080530b5c5c6573df9af45a"
>>>
>>>   GO_IMPORT = "import"
>>>
>>>   S = "${WORKDIR}/git"
>>>
>>> -DOCKER_VERSION = "18.09.0"
>>> +DOCKER_VERSION = "18.09.2"
>>>   PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
>>>
>>>   DEPENDS = " \
>>> --
>>> 2.11.0
>>>
>>
>> --
>> - Thou shalt not follow the NULL pointer, for chaos and madness await
>> thee at its end
>> - "Use the force Harry" - Gandalf, Star Trek II
>
>