Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add puma via govuk_app_config #1513

Merged
merged 1 commit into from
Oct 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ RUN apt-get update -qq && apt-get upgrade -y
RUN curl -sL https://deb.nodesource.com/setup_9.x | bash -
RUN apt-get update && apt-get install -y nodejs && apt-get install npm -y
RUN npm install -g phantomjs-prebuilt@2 --unsafe-perm
RUN gem install foreman

# This image is only intended to be able to run this app in a production RAILS_ENV
ENV RAILS_ENV production
Expand All @@ -28,4 +27,4 @@ RUN GOVUK_APP_DOMAIN=www.gov.uk GOVUK_WEBSITE_ROOT=www.gov.uk bundle exec rails

HEALTHCHECK CMD curl --silent --fail localhost:$PORT || exit 1

CMD foreman run web
CMD bundle exec puma
7 changes: 4 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,9 @@ GEM
jquery-rails (~> 4.3.1)
plek (>= 2.1.0)
rails (>= 3.2.0)
govuk_app_config (4.0.1)
govuk_app_config (4.1.0)
logstasher (>= 1.2.2, < 2.2.0)
puma (~> 5.0)
sentry-rails (~> 4.5.0)
sentry-ruby (~> 4.5.0)
statsd-ruby (~> 1.5.0)
Expand Down Expand Up @@ -338,7 +339,7 @@ GEM
public_suffix (4.0.6)
puma (5.3.2)
nio4r (~> 2.0)
racc (1.5.2)
racc (1.6.0)
rack (2.2.3)
rack-protection (2.1.0)
rack
Expand Down Expand Up @@ -529,7 +530,7 @@ GEM
chronic (>= 0.6.3)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.4.2)
zeitwerk (2.5.1)

PLATFORMS
ruby
Expand Down
2 changes: 2 additions & 0 deletions config/puma.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require "govuk_app_config/govuk_puma"
GovukPuma.configure_rails(self)