Skip to content
This repository has been archived by the owner on Mar 27, 2023. It is now read-only.

Commit

Permalink
Use Puma
Browse files Browse the repository at this point in the history
  • Loading branch information
osahyoun committed Sep 23, 2015
1 parent 8af6095 commit 7f6be45
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ RUN apt-get update -qq && apt-get install -y nodejs imagemagick netcat
RUN mkdir /myapp
WORKDIR /myapp
ADD Gemfile* /myapp/
RUN bundle install
RUN bundle install --jobs 4

EXPOSE 3000
ADD . /myapp

CMD bundle exec unicorn -l 0.0.0.0:3000
CMD bundle exec puma -b tcp://0.0.0.0 -p 3000 -t 5:16
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ gem 'browser'
gem 'share_progress', '>=0.1.2', require: false

gem 'newrelic_rpm'
gem 'unicorn'
gem 'puma'

group :development, :test do
gem 'byebug'
Expand Down
9 changes: 2 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ GEM
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.10.0)
liquid (3.0.3)
logger (1.2.8)
loofah (2.0.2)
Expand Down Expand Up @@ -184,6 +183,7 @@ GEM
mime-types
mimemagic (= 0.3.0)
pg (0.18.2)
puma (2.12.2)
rack (1.6.4)
rack-pjax (0.8.0)
nokogiri (~> 1.5)
Expand Down Expand Up @@ -228,7 +228,6 @@ GEM
activesupport (= 4.2.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.15.0)
rake (10.4.2)
rdoc (4.2.0)
remotipart (1.2.1)
Expand Down Expand Up @@ -296,10 +295,6 @@ GEM
uglifier (2.7.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.9.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
warden (1.2.3)
rack (>= 1.0)
web-console (2.2.1)
Expand Down Expand Up @@ -342,6 +337,7 @@ DEPENDENCIES
paper_trail
paperclip
pg
puma
rails (= 4.2.3)
rails_admin
remotipart (~> 1.2)
Expand All @@ -356,7 +352,6 @@ DEPENDENCIES
spring
timecop
uglifier (>= 1.3.0)
unicorn
web-console (~> 2.0)
webmock

Expand Down

0 comments on commit 7f6be45

Please sign in to comment.