projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14075-uploadfiles
[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 e447fe737b89b8218ba845bd5b26feedd202cf82..a36e5891bcef2c717ff4a0e1a2b51b3036428ed9 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/crunch-setup.sh
+++ b/
tools/arvbox/lib/arvbox/docker/crunch-setup.sh
@@
-1,21
+1,25
@@
#!/bin/bash
#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
exec 2>&1
set -eux -o pipefail
. /usr/local/lib/arvbox/common.sh
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"
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=$localip:${services[
controller-ssl
]}
export ARVADOS_API_HOST_INSECURE=1
export ARVADOS_API_TOKEN=$(cat /usr/src/arvados/services/api/superuser_token)
export CRUNCH_JOB_BIN=/usr/src/arvados/sdk/cli/bin/crunch-job
export ARVADOS_API_HOST_INSECURE=1
export ARVADOS_API_TOKEN=$(cat /usr/src/arvados/services/api/superuser_token)
export CRUNCH_JOB_BIN=/usr/src/arvados/sdk/cli/bin/crunch-job
@@
-24,6
+28,13
@@
export CRUNCH_TMP=/tmp/$1
export CRUNCH_DISPATCH_LOCKFILE=/var/lock/$1-dispatch
export CRUNCH_JOB_DOCKER_BIN=docker
export HOME=/tmp/$1
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
cd /usr/src/arvados/services/api
-exec bundle exec ./script/crunch-dispatch.rb development
+if test "$1" = "crunch0" ; then
+ exec bundle exec ./script/crunch-dispatch.rb $RAILS_ENV --jobs --pipelines
+else
+ exec bundle exec ./script/crunch-dispatch.rb $RAILS_ENV --jobs
+fi