From f60df2f8cf1714c125447a9c73b1fa9ab37c0dfe Mon Sep 17 00:00:00 2001 From: Ashwini Sukale Date: Wed, 27 Nov 2024 18:55:43 +0530 Subject: [PATCH] Poodle ruby version increased to 3.2.0 --- .ruby-version | 2 +- Dockerfile | 5 +++-- Gemfile | 3 ++- Gemfile.lock | 18 ++++++++++-------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.ruby-version b/.ruby-version index b532f3d..a4f52a5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.4 \ No newline at end of file +3.2.0 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1492901..c25dbd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/passenger-full:2.5.1 +FROM phusion/passenger-full:3.0.7 LABEL maintainer="mfenner@datacite.org" # Set correct environment variables. @@ -12,7 +12,8 @@ RUN usermod -a -G docker_env app CMD ["/sbin/my_init"] # Use Ruby 3.1.4 -RUN bash -lc 'rvm --default use ruby-3.1.4' +RUN bash -lc 'rvm install ruby-3.2.0' && \ + bash -lc 'rvm --default use ruby-3.2.0' # Update installed APT packages RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \ diff --git a/Gemfile b/Gemfile index bedf053..fad9f8f 100644 --- a/Gemfile +++ b/Gemfile @@ -27,6 +27,7 @@ gem "rack-utf8_sanitizer", "~> 1.6" gem "git", "~> 1.5" gem "sprockets", "~> 3.7", ">= 3.7.2" gem 'next_rails' +gem 'base64', '~> 0.2.0' group :development, :test do gem "better_errors" @@ -38,7 +39,7 @@ group :development, :test do end group :development do - gem "listen", "~> 3.0.5" + gem "listen", "~> 3.7.1" gem "spring" gem "spring-watcher-listen", "~> 2.0.0" # gem "httplog", "~> 1.0" diff --git a/Gemfile.lock b/Gemfile.lock index 526ef2f..20b3b99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,7 +182,8 @@ GEM multipart-post (~> 2) faraday-net_http (3.3.0) net-http - ffi (1.15.5) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) gender_detector (0.1.2) unicode_utils (>= 1.3.0) git (1.8.1) @@ -217,9 +218,9 @@ GEM jwt (1.5.6) latex-decode (0.4.0) link_header (0.0.8) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + listen (3.7.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) logger (1.6.1) lograge (0.11.2) actionpack (>= 4) @@ -335,8 +336,8 @@ GEM zeitwerk (~> 2.6) rainbow (3.0.0) rake (13.0.6) - rb-fsevent (0.10.4) - rb-inotify (0.10.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) rchardet (1.8.0) rdf (3.3.2) @@ -446,6 +447,7 @@ PLATFORMS DEPENDENCIES base32-url (~> 0.5) + base64 (~> 0.2.0) better_errors binding_of_caller bolognese (~> 2.3.2) @@ -461,7 +463,7 @@ DEPENDENCIES git (~> 1.5) iso8601 (~> 0.9.0) jwt (~> 1.5, >= 1.5.4) - listen (~> 3.0.5) + listen (~> 3.7.1) lograge (~> 0.11.2) logstash-event (~> 1.2, >= 1.2.02) logstash-logger (~> 0.26.1) @@ -487,4 +489,4 @@ DEPENDENCIES webmock (~> 1.20.0) BUNDLED WITH - 2.4.20 + 2.5.23