From 91b8d9d9e4305a32f138106fa379f83ec8766243 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 9 Jan 2020 15:15:33 +0000 Subject: docker-ce: update to v19.03.5 Bump the git hashes to Docker CE v19.03.5. This requires to get the docker daemon binary from a different location as the symlink from the latest/ subdirectory has been removed. See also commit deaac5d4b3fa ("hack/make.sh remove "latest" symlink") in the docker-ce repository. Signed-off-by: Stefan Agner Signed-off-by: Bruce Ashfield --- recipes-containers/docker/docker-ce_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-containers/docker') diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb index 8b8136d5..ef840697 100644 --- a/recipes-containers/docker/docker-ce_git.bb +++ b/recipes-containers/docker/docker-ce_git.bb @@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \ subtle and/or glaring issues. \ " -SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e" +SRCREV_docker = "633a0ea838f10e000b7c6d6eed1623e6e988b5bb" SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381" SRC_URI = "\ git://github.com/docker/docker-ce.git;branch=19.03;name=docker \ @@ -38,7 +38,7 @@ GO_IMPORT = "import" S = "${WORKDIR}/git" -DOCKER_VERSION = "19.03.2-ce" +DOCKER_VERSION = "19.03.5-ce" PV = "${DOCKER_VERSION}+git${SRCREV_docker}" PACKAGES =+ "${PN}-contrib" @@ -99,7 +99,7 @@ do_compile() { do_install() { mkdir -p ${D}/${bindir} cp ${S}/src/import/components/cli/build/docker ${D}/${bindir}/docker - cp ${S}/src/import/components/engine/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd + cp ${S}/src/import/components/engine/bundles/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd cp ${WORKDIR}/git/libnetwork/bin/docker-proxy* ${D}/${bindir}/docker-proxy if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then -- cgit v1.2.3-54-g00ecf