On Fri, Aug 30, 2019 at 7:36 AM Stefan Agner <[email protected]> wrote: > > From: Stefan Agner <[email protected]> > > Use the docker/engine fork of moby which provides a stabilized version > of moby in its 19.03 branch.
I've mentioned before, this recipe really is going to stay on moby, not a curated version of moby or anything like that. I already have some queued updated to docker here, so I'll take care of updating this recipe and stack your other patches on top. Bruce > > Bump all git hashes to what is used in Docker CE v19.03.2-rc1. > The SRCREVs are selected through an audit of moby and docker-ce to > synchronize the build points for the various components. > > Signed-off-by: Stefan Agner <[email protected]> > --- > recipes-containers/docker/docker_git.bb | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/recipes-containers/docker/docker_git.bb > b/recipes-containers/docker/docker_git.bb > index e45f87e..3892c65 100644 > --- a/recipes-containers/docker/docker_git.bb > +++ b/recipes-containers/docker/docker_git.bb > @@ -35,11 +35,11 @@ DESCRIPTION = "Linux container runtime \ > # to a docker.inc recipe > > # moby commit matches the docker-ce swarmkit bump on the 18.09 branch > -SRCREV_moby = "344b093258fcb2195fa393081e5224a6c766c798" > +SRCREV_moby = "ed20165a37b40ff1cfbe55e218344c5e89f30ee2" > SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381" > -SRCREV_cli = "2f1931f9eb2d6bac2efd48d94739f2e9919d4d7d" > +SRCREV_cli = "578ab52ece34b084621954e0b543003410cdbe84" > SRC_URI = "\ > - git://github.com/moby/moby.git;nobranch=1;name=moby \ > + git://github.com/docker/engine.git;branch=19.03;name=moby \ > > git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork > \ > git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \ > file://docker.init \ > @@ -57,7 +57,7 @@ GO_IMPORT = "import" > > S = "${WORKDIR}/git" > > -DOCKER_VERSION = "19.03.0-rc3" > +DOCKER_VERSION = "19.03.2-rc1" > PV = "${DOCKER_VERSION}+git${SRCREV_moby}" > > PACKAGES =+ "${PN}-contrib" > -- > 2.20.1 > > -- > _______________________________________________ > meta-virtualization mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-virtualization -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
