Merge branch 'master' of https://github.com/bigbluebutton/greenlight2

2018-07-09 13:19:59 -04:00
parent b51ac6aa7c 60a5b57121
commit 68d61d115c
28 changed files with 141 additions and 82 deletions
--- a/bin/start
+++ b/bin/start
@ -6,6 +6,8 @@ do
 done

 bundle exec rake db:create
-bundle exec rake db:migrate
+if ! bundle exec rake db:migrate ; then
+  export DB_MIGRATE_FAILED=1
+fi

 exec bundle exec puma -C config/puma.rb