diff --git a/README.md b/README.md index 7a6752d..5800b8c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ See [guides](doc/guides.md) 1. Install Docker Toolbox 1. Make sure you have a machine running: `docker-machine start default && eval "$(docker-machine env default)"` 1. Execute `docker-compose build` -1. Execute `docker-compose run web rake db:create db:migrate db:seed` +1. Execute `docker-compose run web rake db:setup` 1. Execute `docker-compose up` 1. If using Docker Toolbox, use `docker-machine ip default` to get the IP where the server is running. 1. Test the Rails server is running with by visiting `:8080` in your browser. diff --git a/doc/local_dev_setup.md b/doc/local_dev_setup.md index 11047f2..8e920bd 100644 --- a/doc/local_dev_setup.md +++ b/doc/local_dev_setup.md @@ -7,8 +7,7 @@ 1. Install Postgres (Mac OSX instructions below) 1. Copy over DB config: `cp config/database.yml.example config/database.yml` 1. Update config with your database (velocipede), user (velocipede), and password. -1. `rake db:create db:migrate` -1. `rake db:seed` +1. `rake db:setup` 1. Download extJS 4.1 (A version of 4.1 is hosted here: http://my.jasondenney.com/extjs-4.1.1.zip) Latest versions at http://www.sencha.com/products/extjs. Unzip and place where ever you like. 1. Link to your extJS folder path under `public/extjs`: (From app root) `ln -s /MY/PATH/extjs/ public/extjs` 1. `rails s`