From 718987175a2e407e5d2c695f2dc28e9519de232e Mon Sep 17 00:00:00 2001
From: Amy Fong <amy.fong@windriver.com>
Date: Thu, 12 Mar 2015 21:45:03 -0400
Subject: docker: avoid fetching dependencies

Docker's build process will clone missing dependencies which
circumvents the bitbake fetcher. This is a bad thing in many ways, for
example this will not respect BB_NO_NETWORK and DL_DIR settings. To
work around this we are able to provide recipes for each of the
missing dependencies.

The dependencies are all in GO and are required to be added to the
sysroot such that the docker build can find them via GOPATH at build
time. The docker recipe was updated to add these new packages as
dependencies and the explicit clone of go-cli was removed.

After these change we are able to complete the build with networking
disabled after completing a fetchall. Docker functionality was tested
on an image built with these changes and it functions as it did
before.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Amy Fong <amy.fong@windriver.com>
---
 recipes-containers/docker/docker_git.bb | 49 +++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 17 deletions(-)

(limited to 'recipes-containers')

diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index a1d6ff47..8357ee80 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -34,10 +34,31 @@ S = "${WORKDIR}/git"
 DOCKER_VERSION = "1.5.0"
 PV = "${DOCKER_VERSION}+git${SRCREV}"
 
-DEPENDS = "golang-cross btrfs-tools sqlite3 "
+DEPENDS = "golang-cross \
+    go-cli \
+    go-pty \
+    go-context \
+    go-mux \
+    go-patricia \
+    go-net \
+    go-sqlite \
+    go-libtrust \
+    go-logrus \
+    go-fsnotify \
+    go-dbus \
+    go-capability \
+    go-systemd \
+    btrfs-tools \
+    sqlite3 \
+    "
+
 DEPENDS_append_class-target = "lvm2"
 RDEPENDS_${PN} = "curl aufs-util git cgroup-lite util-linux"
 RRECOMMENDS_${PN} = "lxc docker-registry rt-tests"
+DOCKER_PKG="github.com/docker/docker"
+
+do_configure() {
+}
 
 do_compile() {
 	export GOARCH="${TARGET_ARCH}"
@@ -46,16 +67,15 @@ do_compile() {
 		export GOARCH="amd64"
 	fi
 
-	# setting AUTO_GOPATH to use the default vendor configuration
-	# as opposed to setting up GOPATH with all the explicit vendor
-	# directory structure...
-	#
-	# From docker's PACKAGERS.md:
-	# If you'd rather not be bothered with the hassles that setting up
-	# `GOPATH` appropriately can be, and prefer to just get a "build
-	# that works", you should add something similar to this to whatever
-	# script or process you're using to build Docker
-	export AUTO_GOPATH=1
+	# Set GOPATH. See 'PACKAGERS.md'. Don't rely on
+	# docker to download its dependencies but rather
+	# use dependencies packaged independently.
+	cd ${S}
+	rm -rf .gopath
+	mkdir -p .gopath/src/"$(dirname "${DOCKER_PKG}")"
+	ln -sf ../../../.. .gopath/src/"${DOCKER_PKG}"
+	export GOPATH="${S}/.gopath:${S}/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go"
+	cd -
 
 	# Pass the needed cflags/ldflags so that cgo
 	# can find the needed headers files and libraries
@@ -68,12 +88,7 @@ do_compile() {
 	DOCKER_GITCOMMIT="${SRCREV}" \
 	  ./hack/make.sh dynbinary
 
-	export GOPATH=${S}/vendor
-
-	# make nsinit from libcontainer - installed in vendor/bin
-	ln -s ${S} ${S}/vendor/src/github.com/docker/docker
-	mkdir -p ${S}/vendor/src/github.com/codegangsta
-	(cd ${S}/vendor/src/github.com/codegangsta && git clone https://github.com/codegangsta/cli)
+	# make nsinit from libcontainer
 	go install github.com/docker/libcontainer/nsinit/
 }
 
-- 
cgit v1.2.3-54-g00ecf