Use the dedicated docker-proxy as RDEPENDS instead of squeezing it into the docker build.
Signed-off-by: Pascal Bach <[email protected]> --- recipes-containers/docker/docker_git.bb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index 13c2731..ed7643b 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb @@ -19,11 +19,9 @@ DESCRIPTION = "Linux container runtime \ " SRCREV_docker = "708b068d3095c6a6be939eb2da78c921d2e945e2" -SRCREV_libnetwork = "4cb38c2987c236dce03c868d99b57b1e28a4b81c" SRCREV_cli = "0f1bb353423e45e02315e985bd9ddebe6da18457" SRC_URI = "\ 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 \ @@ -68,7 +66,7 @@ RDEPENDS_${PN} = "util-linux iptables \ ${@bb.utils.contains('DISTRO_FEATURES', 'aufs', 'aufs-util', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'cgroup-lite', d)} \ " -RDEPENDS_${PN} += "virtual/containerd virtual/runc" +RDEPENDS_${PN} += "virtual/containerd virtual/runc docker-proxy" RRECOMMENDS_${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat" RSUGGESTS_${PN} = "lxc rt-tests" @@ -115,9 +113,6 @@ do_compile() { # to build this: VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${SRCREV_docker}" ./hack/make.sh dynbinary - # build the proxy - go build -o ${S}/src/import/docker-proxy github.com/docker/libnetwork/cmd/proxy - # build the cli cd ${S}/src/import/.gopath/src/github.com/docker/cli export CFLAGS="" @@ -139,7 +134,6 @@ do_install() { mkdir -p ${D}/${bindir} cp ${WORKDIR}/cli/build/docker ${D}/${bindir}/docker cp ${S}/src/import/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd - cp ${S}/src/import/docker-proxy ${D}/${bindir}/docker-proxy if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system -- 2.11.0 -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
