From 3b79a1a3dbb356b23fa836666dac3beacf0aaa8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 12 Oct 2019 15:05:55 +0200 Subject: [PATCH] Add compatibility between puma and RMV1 Puma was adding commands to `rvm_map_bins`, which meant RMV1 wasn't using the default value of `rvm1_map_bins`. Changing the order we use to require `rmv1/capistrano3` and `capistrano/puma` did not fix the issue. --- config/deploy.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/deploy.rb b/config/deploy.rb index 417336372..d120e3140 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -8,6 +8,7 @@ end set :rails_env, fetch(:stage) set :rvm1_ruby_version, "2.3.2" +set :rvm1_map_bins, -> { fetch(:rvm_map_bins).to_a.concat(%w[rake gem bundle ruby]).uniq } set :application, "consul" set :full_app_name, deploysecret(:full_app_name)