From ad3e2819b13806241579857b92b15a94239b265c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Aug 2021 11:28:28 +0100
Subject: [PATCH] Switch operations site to use ruby 2.8 and bundler 2.x

---
 cookbooks/foundation/recipes/owg.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index 31d41aa1f..fb9aca201 100644
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -24,15 +24,18 @@ package %w[
   gcc
   g++
   make
-  ruby
-  ruby-dev
+  ruby2.7
+  ruby2.7-dev
   libssl-dev
   zlib1g-dev
   pkg-config
 ]
 
 gem_package "bundler" do
-  version "1.17.3"
+  package_name "bundler"
+  version "~> 2.2.22"
+  gem_binary "gem2.7"
+  options "--format-executable"
 end
 
 git "/srv/operations.osmfoundation.org" do
@@ -60,7 +63,7 @@ end
 
 execute "/srv/operations.osmfoundation.org/Gemfile" do
   action :nothing
-  command "bundle install --deployment"
+  command "bundle2.7 install --deployment"
   cwd "/srv/operations.osmfoundation.org"
   user "root"
   group "root"
@@ -68,7 +71,7 @@ execute "/srv/operations.osmfoundation.org/Gemfile" do
 end
 
 execute "/srv/operations.osmfoundation.org" do
-  command "bundle exec jekyll build --trace"
+  command "bundle2.7 exec jekyll build --trace"
   cwd "/srv/operations.osmfoundation.org"
   user "nobody"
   group "nogroup"
-- 
2.39.5