From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Fri, 23 Jun 2017 20:31:08 +0000 (-0400)
Subject: arvbox docker-in-docker crunch-run uses "host" networking mode to reduce
X-Git-Tag: 1.1.0~174
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/50dba76531ad4fdd5ab79598aa192dd3bb1be314

arvbox docker-in-docker crunch-run uses "host" networking mode to reduce
flakiness on linux 3.16.  no issue #

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curoverse.com>
---

diff --git a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service
index c36f0efc6e..408b99e07e 100755
--- a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service
@@ -15,8 +15,14 @@ flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/servi
 flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/crunch-dispatch-local"
 install bin/crunch-run bin/crunch-dispatch-local /usr/local/bin
 
+cat > /usr/local/bin/crunch-run.sh <<EOF
+#!/bin/sh
+exec /usr/local/bin/crunch-run -container-enable-networking=always -container-network-mode=host \$@
+EOF
+chmod +x /usr/local/bin/crunch-run.sh
+
 export ARVADOS_API_HOST=$localip:${services[api]}
 export ARVADOS_API_HOST_INSECURE=1
 export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
 
-exec /usr/local/bin/crunch-dispatch-local -crunch-run-command=/usr/local/bin/crunch-run -poll-interval=3
+exec /usr/local/bin/crunch-dispatch-local -crunch-run-command=/usr/local/bin/crunch-run.sh -poll-interval=3