docker: build: Fix docker connectivity loss

Change-Id: Iaabd176f4032494c8ea40fd1264dafcac01b4a43
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch b/patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch
index b64c15b..d9fd36a 100644 (file)
--- a/patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch
+++ b/patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch
@@ -1,14 +1,11 @@
 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Date: Mon, 29 Aug 2016 22:58:49 +0200
-Subject: [PATCH] build: docker: Use host's network stack
-
-See [1] for full description.
-This change simplifies the network abstraction during build by
-NOT containerizing the containers' networking.
+Subject: [PATCH] build: docker: Use host's /etc/hosts
 
 The original motivation was pointing to local mirrors via host's
-"/etc/hosts", for which an alternative solution could be passing
-"-v /etc/hosts:/etc/hosts".
+"/etc/hosts", for which an alternative solution tested was
+"--net=host" (see [1] for full description), but lead to wierd
+loss of connectivity after a few builds.
 
 [1] https://docs.docker.com/v1.8/articles/networking/
 
@@ -21,12 +18,11 @@ diff --git a/build/docker/runcontext b/build/docker/runcontext
 index 07b0dc1..b0d6d37 100755
 --- a/build/docker/runcontext
 +++ b/build/docker/runcontext
-@@ -115,7 +115,7 @@ if [ -n "$CACHEBASE" ]; then
-     fi
- fi
-
--RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \
-+RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm --net=host \
-     -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \
-     -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \
+@@ -121,6 +121,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm --net=host \
      -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \
+     -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e ARMBAND_BASE -e OPNFV_GIT_SHA \
+     -u $USER_ID:$GROUP_ID -w $PWD \
++    -v /etc/hosts:/etc/hosts \
+     -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT"
+
+ # Passing "debug" puts up an interactive bash shell