From b883b9ebb2eba1d86c3accc25efb59569c7859ad Mon Sep 17 00:00:00 2001
From: Ashwini Sukale <ashwini.sukale@datacite.org>
Date: Tue, 19 Dec 2023 20:56:26 +0530
Subject: [PATCH] Fixed the bundler version as new rubygems is not supporting
 ruby 2.6

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/release.yml | 2 +-
 .github/workflows/stage.yml   | 2 +-
 Dockerfile                    | 4 ++--
 bin/setup                     | 2 +-
 bin/update                    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7003db7..ea08415 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
           MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
         run: |
           cp .env.build .env
-          gem install bundler -v 2.1.4
+          gem install bundler -v 2.4.22
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
       - name: Lint and Test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7122c67..295be74 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
           MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
         run: |
           cp .env.build .env
-          gem install bundler -v 2.1.4
+          gem install bundler -v 2.4.22
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
       - name: Lint and Test
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
index 011f6ba..60ef988 100644
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -30,7 +30,7 @@ jobs:
           MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
         run: |
           cp .env.build .env
-          gem install bundler -v 2.1.4
+          gem install bundler -v 2.4.22
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
       - name: Lint and Test
diff --git a/Dockerfile b/Dockerfile
index 4097c74..d633f01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,8 +35,8 @@ WORKDIR /home/app/webapp
 RUN mkdir -p vendor/bundle && \
     chown -R app:app . && \
     chmod -R 755 . && \
-    gem update --system 3.0.8 && \
-    gem install bundler -v 2.1.4 && \
+    gem update --system 3.4.22 && \
+    gem install bundler -v 2.4.22 && \
     /sbin/setuser app bundle install --path vendor/bundle
 
 # Copy webapp folder
diff --git a/bin/setup b/bin/setup
index e620b4d..063b823 100755
--- a/bin/setup
+++ b/bin/setup
@@ -15,7 +15,7 @@ chdir APP_ROOT do
   # Add necessary setup steps to this file.
 
   puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
+  system! 'gem install bundler -v 2.4.22 --conservative'
   system('bundle check') || system!('bundle install')
 
   # puts "\n== Copying sample files =="
diff --git a/bin/update b/bin/update
index a8e4462..3e3a06d 100755
--- a/bin/update
+++ b/bin/update
@@ -15,7 +15,7 @@ chdir APP_ROOT do
   # Add necessary update steps to this file.
 
   puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
+  system! 'gem install bundler -v 2.4.22 --conservative'
   system('bundle check') || system!('bundle install')
 
   puts "\n== Updating database =="