From 75afdff0fda94f65ca458f267c4b0b198db9c6e8 Mon Sep 17 00:00:00 2001
From: Serhii Zhuha <szhuha@cloudaware.com>
Date: Wed, 1 Jun 2022 11:25:48 +0000
Subject: [PATCH] Bump Ruby version to 3.1.2

---
 BUNDLER_VERSION.txt                   |  2 +-
 RUBY_VERSIONS.txt                     |  2 +-
 VERSION.txt                           |  2 +-
 linux/Rakefile                        |  2 +-
 linux/internal/build-ruby             |  2 +-
 shared/gemfiles/20210107/Gemfile      | 26 ----------
 shared/gemfiles/20210107/Gemfile.lock | 72 ---------------------------
 shared/gemfiles/20220601/Gemfile      |  5 ++
 shared/gemfiles/20220601/Gemfile.lock | 17 +++++++
 9 files changed, 27 insertions(+), 103 deletions(-)
 delete mode 100644 shared/gemfiles/20210107/Gemfile
 delete mode 100644 shared/gemfiles/20210107/Gemfile.lock
 create mode 100644 shared/gemfiles/20220601/Gemfile
 create mode 100644 shared/gemfiles/20220601/Gemfile.lock

diff --git a/BUNDLER_VERSION.txt b/BUNDLER_VERSION.txt
index b9a05a6..0e80d41 100644
--- a/BUNDLER_VERSION.txt
+++ b/BUNDLER_VERSION.txt
@@ -1 +1 @@
-1.17.3
+2.3.14
diff --git a/RUBY_VERSIONS.txt b/RUBY_VERSIONS.txt
index b0f6bf0..ef538c2 100644
--- a/RUBY_VERSIONS.txt
+++ b/RUBY_VERSIONS.txt
@@ -1 +1 @@
-2.4.10
+3.1.2
diff --git a/VERSION.txt b/VERSION.txt
index e728480..69bbccc 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20210206
+20220601
diff --git a/linux/Rakefile b/linux/Rakefile
index e360208..ff7d472 100644
--- a/linux/Rakefile
+++ b/linux/Rakefile
@@ -2,7 +2,7 @@ IMAGE_VERSION = "1.0"
 VERSION       = File.read("../VERSION.txt").strip
 RUBY_VERSIONS = File.read("../RUBY_VERSIONS.txt").strip.split(/\s+/)
 ARCHITECTURES = ["x86_64"]
-CONCURRENCY   = `./internal/cpucount`.to_i
+CONCURRENCY   = `./internal/cpucount`.to_i + 1
 
 task :default => :package
 
diff --git a/linux/internal/build-ruby b/linux/internal/build-ruby
index 50733b9..28575b3 100755
--- a/linux/internal/build-ruby
+++ b/linux/internal/build-ruby
@@ -233,7 +233,7 @@ if [[ "$DEBUG_SHELL" = before ]]; then
 	open_debug_shell
 fi
 if [[ -e /system_shared/gemfiles ]]; then
-	run /tmp/ruby/bin/gem install bundler -v $BUNDLER_VERSION --no-rdoc --no-ri
+	run /tmp/ruby/bin/gem install bundler -v $BUNDLER_VERSION --no-document
 	if [[ "$DEBUG_SHELL" = after ]]; then
 		install_gems || true
 	else
diff --git a/shared/gemfiles/20210107/Gemfile b/shared/gemfiles/20210107/Gemfile
deleted file mode 100644
index de08a19..0000000
--- a/shared/gemfiles/20210107/Gemfile
+++ /dev/null
@@ -1,26 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'bcrypt'
-gem 'charlock_holmes', :platforms => :ruby
-gem 'curses', :platforms => :ruby
-gem 'escape_utils'
-gem 'fast-stemmer'
-gem 'ffi'
-gem 'hitimes'
-gem 'json'
-gem 'kgio', :platforms => :ruby
-gem 'mysql2', :platforms => :ruby
-gem 'nokogiri'
-gem 'nokogumbo', '~> 1.5.0'
-gem 'pg'
-gem 'posix-spawn', :platforms => :ruby
-gem 'puma', :platforms => :ruby
-gem 'raindrops', :platforms => :ruby
-gem 'redcarpet'
-gem 'RedCloth'
-gem 'rugged', :platforms => :ruby
-gem 'sqlite3'
-gem 'thin'
-gem 'unf_ext'
-gem 'unicorn', :platforms => :ruby
-gem 'yajl-ruby'
diff --git a/shared/gemfiles/20210107/Gemfile.lock b/shared/gemfiles/20210107/Gemfile.lock
deleted file mode 100644
index a0aac62..0000000
--- a/shared/gemfiles/20210107/Gemfile.lock
+++ /dev/null
@@ -1,72 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.3.2)
-    bcrypt (3.1.16)
-    charlock_holmes (0.7.7)
-    curses (1.4.0)
-    daemons (1.3.1)
-    escape_utils (1.2.1)
-    eventmachine (1.2.7)
-    fast-stemmer (1.0.2)
-    ffi (1.14.2)
-    hitimes (2.0.0)
-    json (2.5.1)
-    kgio (2.11.3)
-    mini_portile2 (2.4.0)
-    mysql2 (0.5.3)
-    nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (1.5.0)
-      nokogiri
-    pg (1.2.3)
-    posix-spawn (0.3.15)
-    puma (5.1.1)
-      nio4r (~> 2.0)
-    rack (2.2.3)
-    raindrops (0.19.1)
-    redcarpet (3.5.1)
-    rugged (1.1.0)
-    sqlite3 (1.4.2)
-    thin (1.8.0)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    unf_ext (0.0.7.7)
-    unicorn (5.8.0)
-      kgio (~> 2.6)
-      raindrops (~> 0.7)
-    yajl-ruby (1.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  bcrypt
-  charlock_holmes
-  curses
-  escape_utils
-  fast-stemmer
-  ffi
-  hitimes
-  json
-  kgio
-  mysql2
-  nokogiri
-  nokogumbo (~> 1.5.0)
-  pg
-  posix-spawn
-  puma
-  raindrops
-  redcarpet
-  rugged
-  sqlite3
-  thin
-  unf_ext
-  unicorn
-  yajl-ruby
-
-BUNDLED WITH
-   1.17.3
diff --git a/shared/gemfiles/20220601/Gemfile b/shared/gemfiles/20220601/Gemfile
new file mode 100644
index 0000000..5693f9e
--- /dev/null
+++ b/shared/gemfiles/20220601/Gemfile
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'ffi'
+gem 'json'
+gem 'yajl-ruby'
diff --git a/shared/gemfiles/20220601/Gemfile.lock b/shared/gemfiles/20220601/Gemfile.lock
new file mode 100644
index 0000000..3db0bd5
--- /dev/null
+++ b/shared/gemfiles/20220601/Gemfile.lock
@@ -0,0 +1,17 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ffi (1.14.2)
+    json (2.5.1)
+    yajl-ruby (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ffi
+  json
+  yajl-ruby
+
+BUNDLED WITH
+   2.3.14