Merge pull request #804 from cul-it/dev

Merge Dev to Main

Author: sarah-cul

.ruby-version

@@ -1 +1 @@
-ruby-3.2.2
+ruby-3.4.8

Dockerfile

@@ -1,31 +1,29 @@
-ARG RUBY_VERSION=3.2.2
+ARG RUBY_VERSION=3.4.8
 
 ################################################################################
 # Stage for building base image
-# Debian 12
-# Includes high vulnerability:
-#    GnuTLS - https://scout.docker.com/vulnerabilities/id/CVE-2024-0567
-#    Check container-discovery for examples of patching CVEs
-FROM ruby:$RUBY_VERSION-slim-bookworm as ruby_base
+# Debian 13
+FROM ruby:$RUBY_VERSION-slim-trixie as ruby_base
 
 # Install packages required for rails app
 RUN apt-get update -qq && apt-get install -y --no-install-recommends \
     build-essential \
-    default-libmysqlclient-dev=1.1.0 \
-    cron=3.0pl1-162 \
-    nodejs=18.20.4+dfsg-1~deb12u1 \
-    npm=9.2.0~ds1-1 \
-    imagemagick=8:6.9.11.60+dfsg-1.6+deb12u4
+    default-libmysqlclient-dev=1.1.* \
+    cron=3.* \
+    nodejs=20.19.* \
+    npm=9.2.* \
+    imagemagick=8:7.1.1.* \
+    libghc-libyaml-dev=0.1.*
 
-RUN npm install --global yarn@1.22.22
+RUN npm install --global yarn@1.22.*
 
 ################################################################################
 # Install additional libraries for development
 FROM ruby_base as dev_base
 
 RUN apt-get update -qq && apt-get install -y --no-install-recommends \
-    mariadb-server \
-    libsqlite3-dev=3.40.1-2+deb12u2
+    mariadb-server=1:11.8.* \
+    libsqlite3-dev=3.46.*
 
 ################################################################################
 # Build test environment

Gemfile

@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.2.2'
+ruby '3.4.8'
 
-gem 'rails', '~> 8.0.2'
+gem 'rails', '~> 8.1.0'
 
 gem 'appsignal'
 # Reduces boot times through caching; required in config/boot.rb
@@ -32,7 +32,7 @@ gem 'rdoc', require: false
 gem 'riiif'
 gem 'rsolr'
 gem 'ruby-oembed'
-gem 'sidekiq', '~> 7'
+gem 'sidekiq', '~> 8'
 gem 'sitemap_generator'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
@@ -47,7 +47,7 @@ gem 'whenever', require: false
 
 # Gems manually added to control blacklight and spotlight versions
 gem "blacklight", ">= 8.7.0", "< 9"
-gem 'blacklight-gallery', '~> 4.8.0'
+gem 'blacklight-gallery', '~> 4.9.0'
 gem 'blacklight-oembed', '~> 1.0'
 gem 'blacklight-spotlight', '~> 5.2.0'
 gem 'openseadragon', '~> 1.0.0'