Skip to content

Commit

Permalink
Merge pull request #76 from datacite/poodle_build
Browse files Browse the repository at this point in the history
Poodle ruby version increased to 3.2.0
  • Loading branch information
ashwinisukale authored Nov 27, 2024
2 parents e112ea5 + f60df2f commit 495d396
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.4
3.2.0
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-full:2.5.1
FROM phusion/passenger-full:3.0.7
LABEL maintainer="[email protected]"

# Set correct environment variables.
Expand All @@ -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" && \
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
18 changes: 10 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -446,6 +447,7 @@ PLATFORMS

DEPENDENCIES
base32-url (~> 0.5)
base64 (~> 0.2.0)
better_errors
binding_of_caller
bolognese (~> 2.3.2)
Expand All @@ -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)
Expand All @@ -487,4 +489,4 @@ DEPENDENCIES
webmock (~> 1.20.0)

BUNDLED WITH
2.4.20
2.5.23

0 comments on commit 495d396

Please sign in to comment.