Merge branch 'master' into bn_launcher_integration

2018-07-09 13:20:34 -04:00
parent 67c32a396f 68d61d115c
commit 590e189474
12 changed files with 52 additions and 24 deletions
--- a/bin/start
+++ b/bin/start
@ -8,6 +8,8 @@ if [ "$RAILS_ENV" = "production" ]; then
 fi

 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