Skip to content

Commit

Permalink
Update docker config and Readme to match info about webpack
Browse files Browse the repository at this point in the history
  • Loading branch information
talyssonoc committed Sep 27, 2016
1 parent d170590 commit c53516b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Expand Up @@ -15,6 +15,7 @@ copy Gemfile.lock Gemfile.lock
copy .env.sample .env

run bundle install
run npm install

run mkdir /app
workdir /app
Expand Down
12 changes: 10 additions & 2 deletions README.md
Expand Up @@ -98,6 +98,7 @@ Once you have these:
# Install the project dependencies
$ gem install bundler
$ bundle install
$ npm install

# Set up the development database
$ bundle exec rake fulcrum:setup db:setup
Expand Down Expand Up @@ -136,6 +137,11 @@ You will need a Heroku Postgresql plan, and you will also need:
- Cloudinary (for direct client-side uploads, we don't want Carrierwave)
- Google Recaptcha keys (create for free [here](https://www.google.com/recaptcha/admin))

You will also need to add the buildpacks for Node and webpack-rails:

$ heroku buildpacks:add --index 2 https://github.com/heroku/heroku-buildpack-nodejs#v83
$ heroku buildpacks:add --index 3 https://github.com/febeling/webpack-rails-buildpack.git

You may want to skip recaptcha in development, for that you can manually add this to the environment:

Recaptcha.configuration.skip_verify_env << 'development'
Expand Down Expand Up @@ -249,8 +255,10 @@ Here are some general guidelines for contributing:
Javascript, which is covered with a Jasmine test suite in `spec/javascripts/`.
* Run `rake spec` to check the Rails test suite is green. You will need
Firefox with Selenium installed to run the integration tests.
* To run the Javascript test suite, run `rails server` and point your browser
to `http://localhost:3000/specs` or run `rake spec:javascripts`
* To run the Javascript test suite, run `npm test`. The tests are run with
Karma and PhantomJS. The Karma config is already prepared to run the tests on
Chrome too, just open `config/karma.conf.js` and add `'Chrome'`
to the `browsers` array.


License
Expand Down

0 comments on commit c53516b

Please sign in to comment.