Merge pull request wearefriday#58 from wearefriday/pull-request-56

Switch to Puma server per PR wearefriday#56

.ruby-version

@@ -1 +1 @@
-2.3.8
+2.5.3

.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 rvm:
-  - 2.3
+  - 2.5
+before_install:
+  - gem update --system
+  - gem install bundler
 bundler_args: "--without demo_test_run"
 services:
   - postgresql

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3
+FROM ruby:2.5.3
 
 WORKDIR /opt
 RUN curl -Ls https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar -jxf -
@@ -8,8 +8,9 @@ RUN ln -s /opt/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin/
 WORKDIR /app
 ADD Gemfile* /app/
 RUN gem install bundler && bundle config build.nokogiri --use-system-libraries && bundle install --quiet --jobs 16 --retry 5 --without test
+RUN bundle install
 
 ADD . /app
 
 EXPOSE 3000
-CMD ["rails", "server", "-b", "0.0.0.0"]
+CMD ["script/server"]

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.5'
+gem 'rails'
 gem 'pg'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
@@ -22,8 +22,8 @@ gem 'image_size'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
-# Use Unicorn as the app server
-gem 'unicorn'
+# Use Puma as the app server
+gem 'puma'
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development