aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-08-31 13:04:24 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-31 13:04:24 +0000
commit7855e84eb2c41fa7afa235b09909f78609434463 (patch)
tree95103cfc40e9dd601aec6f4b4fc00cefa1d4702f
parente44808a87a0ede58cbffeb55f20ea2a476f64584 (diff)
parentc563c8b061b52cc1506758aa83bfe44c0e11ccb8 (diff)
Merge "build: docker: Use host's network stack" into stable/colorado
-rw-r--r--patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch32
1 files changed, 32 insertions, 0 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
new file mode 100644
index 00000000..b64c15b6
--- /dev/null
+++ b/patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch
@@ -0,0 +1,32 @@
+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.
+
+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".
+
+[1] https://docs.docker.com/v1.8/articles/networking/
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ build/docker/runcontext | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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 \
+ -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \