Merge branch 'master' into 16585-keep-exercise-improvements

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

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index bf18c9aca8404624ae792f27ff3ad33786dc9937..292a4fd746a6697fafa0bda5155e766bab79618d 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
@@ -614,6 +614,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