diff --git a/Capfile b/Capfile index 877cd59..b22f39e 100644 --- a/Capfile +++ b/Capfile @@ -24,8 +24,8 @@ require 'capistrano/deploy' # require 'capistrano/passenger' require 'capistrano/rails' +require 'capistrano/rbenv' require 'capistrano/bundler' -require 'capistrano/rvm' require 'capistrano/puma' require 'capistrano/sidekiq' require 'capistrano/sidekiq/monit' diff --git a/Gemfile b/Gemfile index a809b1f..16d3b59 100644 --- a/Gemfile +++ b/Gemfile @@ -92,6 +92,7 @@ group :development do gem 'capistrano-bundler', require: false gem 'capistrano3-puma', require: false gem 'capistrano-sidekiq' + gem 'capistrano-rbenv', '~> 2.0' end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index bdb9d5d..41f295e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,6 +94,9 @@ GEM capistrano-rails (1.1.5) capistrano (~> 3.1) capistrano-bundler (~> 1.1) + capistrano-rbenv (2.0.3) + capistrano (~> 3.1) + sshkit (~> 1.3) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) @@ -412,6 +415,7 @@ DEPENDENCIES capistrano capistrano-bundler capistrano-rails + capistrano-rbenv (~> 2.0) capistrano-rvm capistrano-sidekiq capistrano3-puma @@ -460,4 +464,4 @@ DEPENDENCIES weibo_2 BUNDLED WITH - 1.10.5 + 1.10.6 diff --git a/config/deploy.rb b/config/deploy.rb index abcecd3..2661ab4 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -10,6 +10,7 @@ set :repo_url, 'git@github.com:Librcn/Libr.git' set :user, 'deployer' set :puma_threads, [4, 16] set :puma_workers, 0 +set :rbenv_ruby, '2.2.3' # Don't change these unless you know what you're doing # set :pty, true