-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Alpine 3.17 comes with ruby-3.1, which runs into some compattibility issues for certain gems. So this includes some patches to make sure it's compattible: 1. openssl is pinned to 3.0.1, the versions shipped with ruby 3.1[0] 2. net-smtp, net-imap and net-pop gems are added as they are no longer bundled[1] 3. psych is kept on a version <4 as version 4 is backwards incompattible[2]. [0]:https://gitlab.com/gitlab-org/gitlab/-/blob/v15.10.0-ee/Gemfile#L22 [1]:mikel/mail#1439 [2]:https://bugs.ruby-lang.org/issues/1786
- Loading branch information
Showing
6 changed files
with
55 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
GITLAB_VERSION=15.10.7 | ||
ALPINE_VERSION=3.16 | ||
RUBY_VERSION=3.0 | ||
ALPINE_VERSION=3.17 | ||
RUBY_VERSION=3.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
diff --git a/Gemfile b/Gemfile | ||
index 8cafe3b8909c..bdb425b4aeda 100644 | ||
--- a/Gemfile | ||
+++ b/Gemfile | ||
@@ -19,7 +19,7 @@ gem 'bootsnap', '~> 1.16.0', require: false | ||
|
||
# Pin openssl to match the version bundled with our supported Rubies. | ||
# See https://stdgems.org/openssl/#gem-version. | ||
-gem 'openssl', '2.2.2' | ||
+gem 'openssl', '3.0.1' | ||
# This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3. | ||
# Since the latest version caused problems with GitLab, we pin this to an older | ||
# version for now. | ||
diff --git a/Gemfile.lock b/Gemfile.lock | ||
index 1f1f566be37c..bd274e05d353 100644 | ||
--- a/Gemfile.lock | ||
+++ b/Gemfile.lock | ||
@@ -1070,7 +1070,7 @@ GEM | ||
validate_email | ||
validate_url | ||
webfinger (>= 1.0.1) | ||
- openssl (2.2.2) | ||
+ openssl (3.0.1) | ||
ipaddr | ||
openssl-signature_algorithm (1.3.0) | ||
openssl (> 2.0) | ||
@@ -1826,7 +1826,7 @@ DEPENDENCIES | ||
omniauth_crowd (~> 2.4.0)! | ||
omniauth_openid_connect (~> 0.6.1) | ||
openid_connect (= 1.3.0) | ||
- openssl (= 2.2.2) | ||
+ openssl (= 3.0.1) | ||
org-ruby (~> 0.9.12) | ||
pact (~> 1.63) | ||
parallel (~> 1.19) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
diff --git a/Gemfile b/Gemfile | ||
index bdb425b4aeda..e453baac9fe4 100644 | ||
--- a/Gemfile | ||
+++ b/Gemfile | ||
@@ -602,3 +602,9 @@ install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0") } do | ||
end | ||
|
||
gem 'duo_api', '~> 1.3' | ||
+ | ||
+# ruby 3.1 compattibility | ||
+gem 'net-smtp' | ||
+gem 'net-imap' | ||
+gem 'net-pop' | ||
+gem 'psych', '<4' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters