Merge branch '16314-testuserdb'

[arvados.git] / tools / arvbox / bin / arvbox

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index af9824c3a8dcd9efc4e8f80cc5bd039ab9b8a9fc..5abaa90e36d1cfc60d286a336fb4551b6e1f5ee6 100755 (executable)
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -194,7 +194,7 @@ run() {
             localip=$(ip addr show $defaultdev | grep 'inet ' | sed 's/ *inet \(.*\)\/.*/\1/')
         fi
        echo "Public arvbox will use address $localip"
-        iptemp=$(tempfile)
+        iptemp=$(mktemp)
         echo $localip > $iptemp
         chmod og+r $iptemp
         PUBLIC="--volume=$iptemp:/var/run/localip_override
@@ -206,7 +206,8 @@ run() {
               --publish=9002:9002
               --publish=25101:25101
               --publish=8001:8001
-              --publish=8002:8002"
+              --publish=8002:8002
+             --publish=45000-45020:45000-45020"
     else
         PUBLIC=""
     fi
@@ -236,7 +237,7 @@ run() {
         mkdir -p "$PG_DATA" "$VAR_DATA" "$PASSENGER" "$GEMS" "$PIPCACHE" "$NPMCACHE" "$GOSTUFF" "$RLIBS"
 
         if ! test -d "$ARVADOS_ROOT" ; then
-            git clone https://github.com/arvados/arvados.git "$ARVADOS_ROOT"
+            git clone https://git.arvados.org/arvados.git "$ARVADOS_ROOT"
         fi
         if ! test -d "$SSO_ROOT" ; then
             git clone https://github.com/arvados/sso-devise-omniauth-provider.git "$SSO_ROOT"
@@ -614,6 +615,7 @@ sv stop keepstore0
 sv stop keepstore1
 sv stop keepproxy
 cd /usr/src/arvados/services/api
+export DISABLE_DATABASE_ENVIRONMENT_CHECK=1
 export RAILS_ENV=development
 bundle exec rake db:drop
 rm /var/lib/arvados/api_database_setup