Merge pull request #1367 from psu-libraries/preview/ruby-upgrade

upgrade to ruby 3.1.6

.circleci/config.yml

@@ -1,13 +1,13 @@
 version: 2.1
 
 orbs:
-  docker: circleci/docker@1.5.0
-  browser-tools: circleci/[email protected]
+   docker: circleci/docker@2.6.0
+   browser-tools: circleci/[email protected]
 
 jobs:
   release:
     docker:
-      - image: harbor.k8s.libraries.psu.edu/library/ci-utils:$CI_UTILS_IMAGE_TAG
+      - image: harbor.k8s.libraries.psu.edu/library/ci-utils:v4.0.4
     environment:
       REGISTRY_HOST: harbor.k8s.libraries.psu.edu
       REGISTRY_REPO: library/psulib_blacklight
@@ -26,18 +26,19 @@ jobs:
 
   publish:
     docker:
-      - image: harbor.k8s.libraries.psu.edu/library/ci-utils:$CI_UTILS_IMAGE_TAG
+      - image: harbor.k8s.libraries.psu.edu/library/ci-utils:v4.0.4
         user: root
     steps:
       - setup_remote_docker:
-          version: docker24
+          version: default
           docker_layer_caching: true
       - checkout
       - docker/check:
           registry: harbor.k8s.libraries.psu.edu
       - docker/build:
           image: library/psulib_blacklight
           registry: harbor.k8s.libraries.psu.edu
+          use-buildkit: true
           extra_build_args: "--target production"
       - docker/push:
           digest-path: /tmp/digest.txt
@@ -48,7 +49,7 @@ jobs:
             echo "Digest is: $(</tmp/digest.txt)"
   deploy:
     docker:
-      - image: harbor.k8s.libraries.psu.edu/library/ci-utils:$CI_UTILS_IMAGE_TAG
+      - image: harbor.k8s.libraries.psu.edu/library/ci-utils:v4.0.4
     environment:
       CONFIG_REPO: [email protected]:psu-libraries/catalog-config.git
     steps:
@@ -62,7 +63,7 @@ jobs:
             ./bin/generate_app
   test:
     docker:
-      - image: cimg/ruby:3.1.2-browsers
+      - image: cimg/ruby:3.1.6-browsers
       - image: harbor.k8s.libraries.psu.edu/library/solr:9.5.0
         environment:
           SOLR_STOP_WAIT: 1

.ruby-version

@@ -1 +1 @@
-3.1.2
+3.1.6

Dockerfile

@@ -1,4 +1,4 @@
-FROM harbor.k8s.libraries.psu.edu/library/ruby-3.1.2-node-16:20241113 as base
+FROM harbor.k8s.libraries.psu.edu/library/ruby-3.1.6-node-16:20241218 AS base
 ARG UID=2000
 
 USER root

Gemfile

@@ -22,7 +22,7 @@ gem 'net-imap', require: false
 gem 'net-pop', require: false
 gem 'net-smtp', require: false
 gem 'okcomputer', '~> 1.18'
-gem 'puma', '~> 6'
+gem 'puma', '~> 6.5'
 gem 'rack-mini-profiler'
 gem 'rails', '~> 7.1.4.1'
 gem 'rsolr', '>= 2.5'

Gemfile.lock

@@ -318,7 +318,7 @@ GEM
     psych (5.2.0)
       stringio
     public_suffix (5.0.5)
-    puma (6.4.3)
+    puma (6.5.0)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.1.8)
@@ -566,7 +566,7 @@ DEPENDENCIES
   niftany (~> 0.10)
   okcomputer (~> 1.18)
   pry-byebug
-  puma (~> 6)
+  puma (~> 6.5)
   rack-mini-profiler
   rails (~> 7.1.4.1)
   rails-controller-testing

README.md

@@ -6,7 +6,7 @@ The Penn State University Libraries' catalog. Built on Blacklight, using Traject
 
 | Software |  Version |
 |----------|------|
-| `ruby`    |  3.1.2 |
+| `ruby`    |  3.1.6 |
 | `rails`   |  6.1.7 |
 | `solr`   |  8.11.2 |