13111: Merge branch 'master' into 12308-go-fuse

[arvados.git] / tools / arvbox / lib / arvbox / docker / crunch-setup.sh

diff --git a/tools/arvbox/lib/arvbox/docker/crunch-setup.sh b/tools/arvbox/lib/arvbox/docker/crunch-setup.sh
index aecd9f12c7157616ae8718c72d937da4a20c893d..b3ec5cd10441f695522c50500a2e64fd3f6d8f5d 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/crunch-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/crunch-setup.sh
@@ -7,16 +7,17 @@ exec 2>&1
 set -eux -o pipefail
 
 . /usr/local/lib/arvbox/common.sh
+. /usr/local/lib/arvbox/go-setup.sh
 
-mkdir -p /var/lib/gopath
-cd /var/lib/gopath
-
-export GOPATH=$PWD
-mkdir -p "$GOPATH/src/git.curoverse.com"
-ln -sfn "/usr/src/arvados" "$GOPATH/src/git.curoverse.com/arvados.git"
 flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/crunchstat"
 flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/sdk/go/crunchrunner"
-install bin/crunchstat bin/crunchrunner /usr/local/bin
+install $GOPATH/bin/crunchstat $GOPATH/bin/crunchrunner /usr/local/bin
+
+if test -s /var/lib/arvados/api_rails_env ; then
+  RAILS_ENV=$(cat /var/lib/arvados/api_rails_env)
+else
+  RAILS_ENV=development
+fi
 
 export ARVADOS_API_HOST=$localip:${services[api]}
 export ARVADOS_API_HOST_INSECURE=1
@@ -28,10 +29,12 @@ export CRUNCH_DISPATCH_LOCKFILE=/var/lock/$1-dispatch
 export CRUNCH_JOB_DOCKER_BIN=docker
 export HOME=/tmp/$1
 export CRUNCH_JOB_DOCKER_RUN_ARGS=--net=host
+# Stop excessive stat of /etc/localtime
+export TZ='America/New_York'
 
 cd /usr/src/arvados/services/api
 if test "$1" = "crunch0" ; then
-    exec bundle exec ./script/crunch-dispatch.rb development --jobs --pipelines
+    exec bundle exec ./script/crunch-dispatch.rb $RAILS_ENV --jobs --pipelines
 else
-    exec bundle exec ./script/crunch-dispatch.rb development --jobs
+    exec bundle exec ./script/crunch-dispatch.rb $RAILS_ENV --jobs
 fi