summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker/docker.inc
diff options
context:
space:
mode:
authorPaolo Barbolini <paolo.barbolini@m4ss.net>2025-01-23 12:23:19 +0100
committerBruce Ashfield <bruce.ashfield@gmail.com>2025-01-30 18:52:31 +0000
commitfc423a7cb882553fe4a29a23e6135c9f1cc8e4d0 (patch)
tree390daf73d72ca24e5311b240779b1bc6d139daec /recipes-containers/docker/docker.inc
parent57fe8d036440625153bf26258248adcdd20855c6 (diff)
downloadmeta-virtualization-fc423a7cb882553fe4a29a23e6135c9f1cc8e4d0.tar.gz
docker: switch libnetwork to moby version
Some time ago libnetwork was moved from it's own repository to moby. This patch updates the docker recipe to use the new location Signed-off-by: Paolo Barbolini <paolo.barbolini@m4ss.net> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/docker/docker.inc')
-rw-r--r--recipes-containers/docker/docker.inc7
1 files changed, 1 insertions, 6 deletions
diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc
index 2abca502..4e0aa14f 100644
--- a/recipes-containers/docker/docker.inc
+++ b/recipes-containers/docker/docker.inc
@@ -64,7 +64,6 @@ do_compile() {
64 ln -sf ../../../.. .gopath/src/"${DOCKER_PKG}" 64 ln -sf ../../../.. .gopath/src/"${DOCKER_PKG}"
65 65
66 mkdir -p .gopath/src/github.com/docker 66 mkdir -p .gopath/src/github.com/docker
67 ln -sf ${S}/libnetwork .gopath/src/github.com/docker/libnetwork
68 ln -sf ${S}/cli .gopath/src/github.com/docker/cli 67 ln -sf ${S}/cli .gopath/src/github.com/docker/cli
69 68
70 export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor" 69 export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor"
@@ -94,17 +93,13 @@ do_compile() {
94 export LDFLAGS="" 93 export LDFLAGS=""
95 export DOCKER_VERSION=${DOCKER_VERSION} 94 export DOCKER_VERSION=${DOCKER_VERSION}
96 VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${DOCKER_COMMIT}" make dynbinary 95 VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${DOCKER_COMMIT}" make dynbinary
97
98 # build the proxy
99 cd ${S}/src/import/.gopath/src/github.com/docker/libnetwork
100 oe_runmake cross-local
101} 96}
102 97
103do_install() { 98do_install() {
104 mkdir -p ${D}/${bindir} 99 mkdir -p ${D}/${bindir}
105 cp ${S}/cli/build/docker ${D}/${bindir}/docker 100 cp ${S}/cli/build/docker ${D}/${bindir}/docker
106 cp ${S}/src/import/bundles/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd 101 cp ${S}/src/import/bundles/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
107 cp ${S}/libnetwork/bin/docker-proxy* ${D}/${bindir}/docker-proxy 102 cp ${S}/src/import/bundles/dynbinary-daemon/docker-proxy ${D}/${bindir}/docker-proxy
108 103
109 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 104 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
110 install -d ${D}${systemd_unitdir}/system 105 install -d ${D}${systemd_unitdir}/system