Revert "Switch Canary to use Puma for its webserver instead of WEBrick"

This reverts commit c8a8d2c1b5.
2017-09-03 16:51:55 -07:00 · 2017-09-03 16:51:55 -07:00 · 9e8a768e11
parent d9d9a843ca
commit 9e8a768e11
4 changed files with 4 additions and 7 deletions
--- a/2
+++ b/2
@ -18,4 +18,4 @@ ADD app/ ${APP_DIR}/app/
 ADD config.ru ${APP_DIR}/
 ADD views ${APP_DIR}/views/
 ADD assets ${APP_DIR}/assets/
-CMD bundle exec puma
+CMD bundle exec rackup -o 0.0.0.0
--- a/5
+++ b/5
@ -1,11 +1,10 @@
 source 'https://rubygems.org'

 gem 'haml'
-gem 'httparty'
-gem 'puma'
+gem 'sinatra'
 gem 'sentry-raven'
 gem 'sentry-api'
-gem 'sinatra'
+gem 'httparty'

 group :test do
  gem 'rspec'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -17,7 +17,6 @@ GEM
    multi_xml (0.6.0)
    multipart-post (2.0.0)
    mustermann (1.0.1)
-    puma (3.10.0)
    rack (2.0.3)
    rack-protection (2.0.0)
      rack
@ -52,7 +51,6 @@ PLATFORMS
 DEPENDENCIES
  haml
  httparty
-  puma
  rspec
  sentry-api
  sentry-raven
--- a/2
+++ b/2
@ -10,7 +10,7 @@ depends: Gemfile
 	./scripts/ruby bundle install

 run: depends
-	./scripts/ruby bundle exec puma
+	./scripts/ruby bundle exec rackup -o 0.0.0.0

 container: depends Dockerfile
 	docker build -t rtyler/codevalet-canary .