Update to ruby 3.1.6 and set passenger_preload_bundler on to avoid gem version conflicts

.github/workflows/build.yml

@@ -15,12 +15,13 @@ jobs:
       MEMCACHE_SERVERS: "localhost:11211"
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Ruby 3.1.4
+      - name: Set up Ruby 3.1.6
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.4
+          ruby-version: 3.1.6
+          rubygems: 3.6.0
         env:
-          BUNDLER_VERSION: 2.4.22
+          BUNDLER_VERSION: 2.6.9
       - uses: actions/cache@v3
         with:
           path: vendor/bundle

.github/workflows/release.yml

@@ -16,12 +16,13 @@ jobs:
       SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }}
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Ruby 3.1.4
+      - name: Set up Ruby 3.1.6
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.4
+          ruby-version: 3.1.6
+          rubygems: 3.6.0
         env:
-          BUNDLER_VERSION: 2.4.22
+          BUNDLER_VERSION: 2.6.9
       - uses: actions/cache@v3
         with:
           path: vendor/bundle

.github/workflows/stage.yml

@@ -15,12 +15,13 @@ jobs:
       MEMCACHE_SERVERS: "localhost:11211"
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Ruby 3.1.4
+      - name: Set up Ruby 3.1.6
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.4
+          ruby-version: 3.1.6
+          rubygems: 3.6.0
         env:
-          BUNDLER_VERSION: 2.4.22
+          BUNDLER_VERSION: 2.6.9
       - uses: actions/cache@v3
         with:
           path: vendor/bundle

.ruby-version

@@ -1 +1 @@
-3.1.4
+3.1.6

Dockerfile

@@ -11,8 +11,8 @@ RUN usermod -a -G docker_env app
 # Use baseimage-docker's init process.
 CMD ["/sbin/my_init"]
 
-# Use Ruby 3.1.4
-RUN bash -lc 'rvm install ruby-3.1.4 && rvm --default use ruby-3.1.4'
+# Use Ruby 3.1.6
+RUN bash -lc 'rvm --default use ruby-3.1.6'
 
 # Update installed APT packages
 RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
@@ -35,8 +35,8 @@ WORKDIR /home/app/webapp
 RUN mkdir -p vendor/bundle && \
     chown -R app:app . && \
     chmod -R 755 . && \
-    gem update --system 3.5.6 && \
-    gem install bundler -v 2.5.6 && \
+    gem update --system 3.6.0 && \
+    gem install bundler -v 2.6.9 && \
     su - app -c "bundle config set path 'vendor/bundle'" && \
     su - app -c 'cd /home/app/webapp && bundle install'
 

Gemfile.lock

@@ -76,18 +76,19 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     base64 (0.2.0)
+    bcp47_spec (0.2.1)
     benchmark (0.4.0)
     benchmark_methods (0.7)
-    better_errors (2.9.1)
-      coderay (>= 1.0.0)
+    better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
+      rouge (>= 1.0.0)
     bibtex-ruby (6.1.0)
       latex-decode (~> 0.0)
       racc (~> 1.7)
     bigdecimal (3.1.8)
-    binding_of_caller (1.0.0)
-      debug_inspector (>= 0.0.1)
+    binding_of_caller (1.0.1)
+      debug_inspector (>= 1.2.0)
     bolognese (2.3.9)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
@@ -113,12 +114,12 @@ GEM
       rdf-turtle (~> 3.1)
       thor (>= 0.19)
     builder (3.2.4)
-    byebug (11.1.3)
-    capybara (3.36.0)
+    byebug (12.0.0)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
@@ -133,7 +134,6 @@ GEM
     citeproc-ruby (1.1.14)
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.6)
-    coderay (1.1.3)
     colorize (0.8.1)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
@@ -147,10 +147,10 @@ GEM
       csl (~> 1.0)
     dalli (3.2.8)
     date (3.4.0)
-    debug_inspector (1.1.0)
+    debug_inspector (1.2.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    dotenv (2.7.6)
+    dotenv (3.1.8)
     drb (2.2.1)
     ebnf (2.3.5)
       htmlentities (~> 4.3)
@@ -164,7 +164,7 @@ GEM
       nokogiri (>= 1.4.3)
     erubi (1.13.0)
     excon (0.71.1)
-    faraday (2.12.1)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -183,7 +183,7 @@ GEM
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
     ffi (1.16.3)
-    forwardable (1.3.3)
+    forwardable (1.3.2)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
     git (1.19.1)
@@ -201,22 +201,25 @@ GEM
       reline (>= 0.4.2)
     iso8601 (0.9.1)
     json (2.6.1)
-    json-canonicalization (0.3.1)
-    json-ld (3.2.4)
+    json-canonicalization (1.0.0)
+    json-ld (3.3.2)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.3)
+      json-canonicalization (~> 1.0)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (>= 2.2, < 4)
-      rdf (~> 3.2, >= 3.2.10)
-    json-ld-preloaded (3.2.2)
-      json-ld (~> 3.2)
-      rdf (~> 3.2)
+      rdf (~> 3.3)
+      rexml (~> 3.2)
+    json-ld-preloaded (3.3.2)
+      json-ld (~> 3.3)
+      rdf (~> 3.3)
     jsonlint (0.3.0)
       oj (~> 3)
       optimist (~> 3)
+    language_server-protocol (3.17.0.5)
     latex-decode (0.4.0)
     link_header (0.0.8)
+    lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -254,6 +257,7 @@ GEM
       oj_mimic_json (~> 1.0, >= 1.0.1)
     matrix (0.4.2)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.9)
     minitest (5.20.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -271,26 +275,33 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.18.10)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.18.10-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-darwin)
       racc (~> 1.4)
     observer (0.1.2)
-    oj (3.14.2)
+    oj (3.16.12)
+      bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
     oj_mimic_json (1.0.1)
     open-uri (0.5.0)
       stringio
       time
       uri
     optimist (3.2.1)
+    ostruct (0.6.3)
     parallel (1.23.0)
-    parser (3.2.2.4)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
     postrank-uri (1.1)
       addressable (>= 2.4.0)
       nokogiri (>= 1.8.0)
       public_suffix (>= 4.0.0, < 5)
+    prism (1.6.0)
     psych (5.2.0)
       stringio
     public_suffix (4.0.7)
@@ -340,8 +351,13 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rchardet (1.8.0)
-    rdf (3.2.11)
+    rdf (3.3.4)
+      bcp47_spec (~> 0.2)
+      bigdecimal (~> 3.1, >= 3.1.5)
       link_header (~> 0.0, >= 0.0.8)
+      logger (~> 1.5)
+      ostruct (~> 0.6)
+      readline (~> 0.0)
     rdf-rdfxml (3.2.2)
       builder (~> 3.2)
       htmlentities (~> 4.3)
@@ -355,12 +371,15 @@ GEM
       rexml (~> 3.2)
     rdoc (6.8.1)
       psych (>= 4.0.0)
-    regexp_parser (2.2.0)
+    readline (0.0.4)
+      reline
+    regexp_parser (2.11.3)
     reline (0.5.11)
       io-console (~> 0.5)
     request_store (1.5.0)
       rack (>= 1.4)
     rexml (3.2.6)
+    rouge (4.6.1)
     rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
     rspec-expectations (3.9.4)
@@ -378,24 +397,30 @@ GEM
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.4)
-    rubocop (1.50.2)
+    rubocop (1.81.7)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.6.1)
-      rubocop (>= 0.71.0)
-    rubocop-rails (2.19.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.26.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+    rubocop-rails (2.33.4)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
     ruby-progressbar (1.13.0)
     scanf (1.0.0)
     securerandom (0.3.2)
@@ -410,7 +435,8 @@ GEM
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (3.7.2)
+    sprockets (3.7.5)
+      base64
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     stringio (3.1.2)
@@ -429,7 +455,7 @@ GEM
     uri (1.0.2)
     useragent (0.16.10)
     vcr (5.1.0)
-    webmock (3.14.0)
+    webmock (3.26.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -444,6 +470,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-23
+  ruby
   x86_64-darwin-20
 
 DEPENDENCIES
@@ -484,4 +511,4 @@ DEPENDENCIES
   webmock (~> 3.8, >= 3.8.2)
 
 BUNDLED WITH
-   2.3.26
+   2.6.9

vendor/docker/webapp.conf

@@ -1,4 +1,5 @@
 passenger_max_pool_size 25;
+passenger_preload_bundler on;
 
 server {
     listen 80 default_server;