From 750016f352ce207a28efb76a74099a8e805c821c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 27 Sep 2020 13:01:33 +0000 Subject: [PATCH 1/2] Bump capistrano-bundler from 1.3.0 to 2.0.1 Bumps [capistrano-bundler](https://github.com/capistrano/bundler) from 1.3.0 to 2.0.1. - [Release notes](https://github.com/capistrano/bundler/releases) - [Commits](https://github.com/capistrano/bundler/compare/v1.3.0...v2.0.1) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- Gemfile.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d62b3054b..252b13a16 100644 --- a/Gemfile +++ b/Gemfile @@ -94,7 +94,7 @@ end group :development do gem "capistrano", "~> 3.14.1", require: false - gem "capistrano-bundler", "~> 1.2", require: false + gem "capistrano-bundler", "~> 2.0", require: false gem "capistrano-rails", "~> 1.6.1", require: false gem "capistrano3-delayed-job", "~> 1.7.6" gem "capistrano3-puma", "~> 4.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index 2225debba..fe69a64cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,9 +105,8 @@ GEM i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.3.0) + capistrano-bundler (2.0.1) capistrano (~> 3.1) - sshkit (~> 1.2) capistrano-rails (1.6.1) capistrano (~> 3.1) capistrano-bundler (>= 1.1, < 3) @@ -640,7 +639,7 @@ DEPENDENCIES byebug (~> 11.1.1) cancancan (~> 2.3.0) capistrano (~> 3.14.1) - capistrano-bundler (~> 1.2) + capistrano-bundler (~> 2.0) capistrano-rails (~> 1.6.1) capistrano3-delayed-job (~> 1.7.6) capistrano3-puma (~> 4.0.0) From 721a87b06bd9bde97f35d0264f3fdfe4c5241b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sun, 27 Sep 2020 15:22:18 +0200 Subject: [PATCH 2/2] Add .bundle to shared dirs in Capistrano The 2.0.0 release of capistrano-bundler creates a configuration file under `.bundle/config`. It was creating a new configuration file for each release because we weren't using a shared folder. Besides, quoting the capistrano-bundler README [1]: > In order for Bundler to work efficiently on the server, its project > configuration directory (/.bundle/) should be persistent > across releases. You need to add it to the linked_dirs Capistrano > variable [1] https://github.com/capistrano/bundler/blob/v2.0.1/README.md --- config/deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/deploy.rb b/config/deploy.rb index be343f259..c37e3c378 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -25,7 +25,7 @@ set :pty, true set :use_sudo, false set :linked_files, %w[config/database.yml config/secrets.yml] -set :linked_dirs, %w[log tmp public/system public/assets public/ckeditor_assets] +set :linked_dirs, %w[.bundle log tmp public/system public/assets public/ckeditor_assets] set :keep_releases, 5