Skip to content

Commit

Permalink
Bundler wins. Just set BUNDLE_GEMFILE manually
Browse files Browse the repository at this point in the history
...and go back to using Bundler.with_clean_env.
  • Loading branch information
seven1m committed Feb 13, 2020
1 parent d84e0ae commit 3d1c5e0
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/puma/launcher.rb
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,13 @@ def prune_bundler

log "* Pruning Bundler environment"
home = ENV['GEM_HOME']
Bundler.with_original_env do
bundle_gemfile = ENV['BUNDLE_GEMFILE']
Bundler.with_clean_env do
require 'pp'
puts 'ENV after Bundler.with_original_env:'
pp ENV
ENV['GEM_HOME'] = home
ENV['BUNDLE_GEMFILE'] = bundle_gemfile
ENV['PUMA_BUNDLER_PRUNED'] = '1'
args = [Gem.ruby, puma_wild_location, '-I', dirs.join(':'), deps.join(',')] + @original_argv
# Ruby 2.0+ defaults to true which breaks socket activation
Expand Down

0 comments on commit 3d1c5e0

Please sign in to comment.