diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-30 18:08:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-30 18:08:47 +0000 |
| commit | 1b186467787c727598230280a9390ad14591d80b (patch) | |
| tree | 8d05c7b4a1986589d4339f503147426feaf3afe9 /patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch | |
| parent | 3483c7fbcc24adeec5fea80c47cceb460325efc0 (diff) | |
| parent | 662822c6f09be5b23dc3f39f85ee2f21a6d3d405 (diff) | |
Merge "docker: build: Fix docker connectivity loss"
Diffstat (limited to 'patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch')
| -rw-r--r-- | patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch | 26 |
1 files changed, 11 insertions, 15 deletions
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 b64c15b6..d9fd36a0 100644 --- 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 |