projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18657: Almost working again, stupid Ruby
[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 4ad2aed0ccdbb6c0f4c4e7ceaa95a4c818dc6120..6e455b8297fe2bc9c18e76a44b6fba27733d5f16 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
- flock $GEM_HOME/gems.lock b
undle exec
rake db:setup
+ flock $GEM_HOME/gems.lock b
in/
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=$(flock $GEM_HOME/gems.lock bundle exec ./script/create_superuser_token.rb)
+ superuser_tok=$(flock $GEM_HOME/gems.lock b
in/b
undle 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
-flock $GEM_HOME/gems.lock b
undle exec
rake db:migrate
+flock $GEM_HOME/gems.lock b
in/
rake db:migrate