Merge pull request #25 from hintmedia/fix/handle-new-apps

handle new apps with no schema.rb or structure.sql

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Deprecated
 ### Removed
 ### Fixed
+- handle new apps with no schema.rb or structure.sql [I22](https://github.com/hintmedia/railsdock/issues/22) [PR25](https://github.com/hintmedia/railsdock/pull/25)
 ### Security
 
 ## [0.3.1] - 07-20-2020

lib/railsdock/templates/install/default/entrypoint.sh

@@ -13,6 +13,7 @@ function lock_setup { mkdir -p $APP_TEMP_PATH && touch $APP_SETUP_LOCK; }
 function unlock_setup { rm -rf $APP_SETUP_LOCK; }
 function wait_setup { echo "Waiting for app setup to finish..."; sleep $APP_SETUP_WAIT; }
 function check_host { ping -q -c1 $HOST_DOMAIN > /dev/null 2>&1; }
+function schema_file_exists { [[ -e "db/schema.rb" || -e "db/structure.sql" ]]; }
 
 # 2: 'Unlock' the setup process if the script exits prematurely:
 trap unlock_setup HUP INT QUIT KILL TERM EXIT
@@ -41,9 +42,10 @@ then
 
   yarn install
   # 9: Setup the database if it doesn't
-  if ! rake db:version
-  then
-    rake db:setup
+  if ! schema_file_exists; then
+    bundle exec rake db:create && bundle exec rake db:migrate
+  elif ! rake db:migrate 2> /dev/null; then
+    bundle exec rake db:setup
   fi
 
   # check if the docker host is running on mac or windows