From 3c435ae8f0f9150dccd7d3a272323e3ee7f218d3 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Thu, 13 Jul 2017 10:09:04 -0700 Subject: docker: Uprev to latest based on runc 1.0-rc3 The build method for docker client changed where by the docker cli is now required to be pulled in from a separate git tree to be built. The integration patch to cross compile was also upreved since some parts of it were accepted upstream while other parts have not been accepted at this time. Signed-off-by: Jason Wessel Signed-off-by: Bruce Ashfield --- recipes-containers/docker/docker_git.bb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'recipes-containers/docker/docker_git.bb') diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index c1b38dce..acb17709 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb @@ -18,11 +18,13 @@ DESCRIPTION = "Linux container runtime \ subtle and/or glaring issues. \ " -SRCREV_docker = "49bf474f9ed7ce7143a59d1964ff7b7fd9b52178" -SRCREV_libnetwork="0f534354b813003a754606689722fe253101bc4e" +SRCREV_docker = "e639a70fbe999d96354a5bcf560231b7b8aa935c" +SRCREV_libnetwork = "26addf43a5d925ff79d262dbbdb5344bc2b6e198" +SRCREV_cli = "a765218f1988e85b68aa3977f34893ec7b059a60" SRC_URI = "\ - git://github.com/docker/docker.git;nobranch=1;name=docker \ + git://github.com/moby/moby.git;nobranch=1;name=docker \ git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=libnetwork \ + git://github.com/docker/cli;branch=master;name=cli;destsuffix=cli \ file://docker.init \ file://hi.Dockerfile \ file://context-use-golang.org-x-net-pkg-until-we-move-to-go.patch \ @@ -30,7 +32,7 @@ SRC_URI = "\ # Apache-2.0 for docker LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=aadc30f9c14d876ded7bedc0afd2d3d7" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9740d093a080530b5c5c6573df9af45a" S = "${WORKDIR}/git" @@ -86,6 +88,7 @@ do_compile() { mkdir -p .gopath/src/github.com/docker ln -sf ../../../../../libnetwork .gopath/src/github.com/docker/libnetwork + ln -sf ../../../../../cli .gopath/src/github.com/docker/cli export GOPATH="${S}/.gopath:${S}/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go" @@ -107,6 +110,9 @@ do_compile() { # build the proxy go build -o ${S}/docker-proxy github.com/docker/libnetwork/cmd/proxy + + # build the cli + go build -o ${S}/bundles/latest/dynbinary-client/docker github.com/docker/cli/cmd/docker } SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" -- cgit v1.2.3-54-g00ecf