Skip to content

Bump puma from 6.6.1 to 7.1.0 #6059

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.

Sign up for GitHub

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

Draft
dependabot wants to merge 4 commits into
base: master
Choose a base branch
from
+9 −6
Draft

Bump puma from 6.6.1 to 7.1.0 #6059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
baef2ea
Bump puma from 6.6.1 to 7.1.0
dependabot[bot] Jan 8, 2026
1268f85
Test if preloading causes the issues
jenshenny Jan 8, 2026
55c87c5
Disable DD tracing when testing docker image
jenshenny Jan 8, 2026
d6a99ab
Disable datadog during build
jenshenny Jan 8, 2026
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ gem "omniauth", "~> 2.1"
gem "omniauth-rails_csrf_protection", "~> 2.0"
gem "openid_connect", "~> 2.3"
gem "pg", "~> 1.6"
gem "puma", "~> 6.6"
gem "puma", "~> 7.1"
gem "puma-plugin-statsd", "~> 2.7"
gem "rack", "~> 3.2"
gem "rackup", "~> 2.3"
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ GEM
date
stringio
public_suffix (7.0.2)
puma (6.6.1)
puma (7.1.0)
nio4r (~> 2.0)
puma-plugin-statsd (2.7.0)
puma (>= 5.0, < 8)
Expand Down Expand Up @@ -1003,7 +1003,7 @@ DEPENDENCIES
propshaft (~> 1.3.1)
prosopite (~> 2.1)
pry-byebug (~> 3.11)
puma (~> 6.6)
puma (~> 7.1)
puma-plugin-statsd (~> 2.7)
pundit (~> 2.5)
rack (~> 3.2)
Expand Down Expand Up @@ -1283,7 +1283,7 @@ CHECKSUMS
pry-byebug (3.11.0) sha256=0b0abb7d309bc7f00044d512a3c8567274f7012b944b38becc8440439a1cea72
psych (5.3.1) sha256=eb7a57cef10c9d70173ff74e739d843ac3b2c019a003de48447b2963d81b1974
public_suffix (7.0.2) sha256=9114090c8e4e7135c1fd0e7acfea33afaab38101884320c65aaa0ffb8e26a857
puma (6.6.1) sha256=b9b56e4a4ea75d1bfa6d9e1972ee2c9f43d0883f011826d914e8e37b3694ea1e
puma (7.1.0) sha256=e45c10cb124f224d448c98db653a75499794edbecadc440ad616cf50f2fd49dd
puma-plugin-statsd (2.7.0) sha256=04f243a7233f4d06ec0e26f1a3522bce18a5910ae711763fabff22681bdad08b
pundit (2.5.2) sha256=e374152baa24f90b630428293faf4b4c5468fc3cc010165f7d8fcb44ce108bbd
pwned (2.4.1) sha256=e375b45e1cd78aded2c923737f75e09e64bc66582142c144bd85f4ce1fa0955d
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/datadog.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

# Enabling datadog functionality
running_locally = Rails.env.local? || defined?(Rails::Console)
enabled = !running_locally || ENV["DD_AGENT_HOST"].present?
enabled = !running_locally || ENV["DD_AGENT_HOST"].present? || !ENV["DD_DISABLED"]
c.runtime_metrics.enabled = enabled
c.profiling.enabled = enabled
c.tracing.enabled = enabled
Expand Down
5 changes: 4 additions & 1 deletion script/build_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,18 @@ docker buildx build --cache-from=type=local,src=/tmp/.buildx-cache \
# This is a ruby script we run to ensure that all dependencies are configured properly in
# the docker container, even if they are not used in the the few requests made to the application.
docker run -e RAILS_ENV=production -e SECRET_KEY_BASE_DUMMY=1 -e DATABASE_URL=postgresql://localhost \
--net host "$DOCKER_TAG" \
-e DD_DISABLED=true
--net host "$DOCKER_TAG"
-- bin/rails runner - <<-EOS
Magic.buffer('')
EOS

docker run -e RAILS_ENV=production -e SECRET_KEY_BASE_DUMMY=1 -e DATABASE_URL=postgresql://localhost \
-e DD_DISABLED=true
--net host "$DOCKER_TAG" \
-- bin/rails db:create db:migrate
docker run -d -e RAILS_ENV=production -e SECRET_KEY_BASE_DUMMY=1 -e DATABASE_URL=postgresql://localhost \
-e DD_DISABLED=true
--net host "$DOCKER_TAG" \
-- puma --environment production --config /app/config/puma.rb

Expand Down
Loading