projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "wrong bundler" error starting API server in arvbox
[arvados.git]
/
tools
/
arvbox
/
lib
/
arvbox
/
docker
/
api-setup.sh
diff --git
a/tools/arvbox/lib/arvbox/docker/api-setup.sh
b/tools/arvbox/lib/arvbox/docker/api-setup.sh
index f20278a69c46a90560dfd9a8888681be076c01c5..b1b6d37c0381648f9518041854c4d8a72618ee87 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/api-setup.sh
+++ b/
tools/arvbox/lib/arvbox/docker/api-setup.sh
@@
-56,16
+56,16
@@
EOF
fi
if ! test -f $ARVADOS_CONTAINER_PATH/api_database_setup ; then
fi
if ! test -f $ARVADOS_CONTAINER_PATH/api_database_setup ; then
- bundle exec rake db:setup
+
flock $GEM_HOME/gems.lock bin/
bundle exec rake db:setup
touch $ARVADOS_CONTAINER_PATH/api_database_setup
fi
if ! test -s $ARVADOS_CONTAINER_PATH/superuser_token ; then
touch $ARVADOS_CONTAINER_PATH/api_database_setup
fi
if ! test -s $ARVADOS_CONTAINER_PATH/superuser_token ; then
- superuser_tok=$(bundle exec ./script/create_superuser_token.rb)
+ superuser_tok=$(
flock $GEM_HOME/gems.lock bin/
bundle exec ./script/create_superuser_token.rb)
echo "$superuser_tok" > $ARVADOS_CONTAINER_PATH/superuser_token
fi
rm -rf tmp
mkdir -p tmp/cache
echo "$superuser_tok" > $ARVADOS_CONTAINER_PATH/superuser_token
fi
rm -rf tmp
mkdir -p tmp/cache
-bundle exec rake db:migrate
+
flock $GEM_HOME/gems.lock bin/
bundle exec rake db:migrate