diff --git a/.ruby-gemset b/.ruby-gemset index 984fb20..198aba4 100644 --- a/.ruby-gemset +++ b/.ruby-gemset @@ -1 +1 @@ -wrestlingdev +wrestlingdev \ No newline at end of file diff --git a/.ruby-version b/.ruby-version index a9cadc6..6eb7609 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.2.0 +ruby-4.0.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile index 6bbeabd..5c1c362 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '3.2.0' +ruby '4.0.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '8.1.2' diff --git a/Gemfile.lock b/Gemfile.lock index 5e3c77e..7cdd3aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -117,8 +117,9 @@ GEM influxdb (~> 0.6, >= 0.6.4) railties (>= 5.0) io-console (0.8.2) - irb (1.16.0) + irb (1.17.0) pp (>= 0.6.0) + prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) jbuilder (2.14.1) @@ -377,7 +378,7 @@ DEPENDENCIES tzinfo-data RUBY VERSION - ruby 3.2.0p0 + ruby 4.0.1p0 BUNDLED WITH 2.6.9 diff --git a/README.md b/README.md index ea90dbe..9801cd0 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This application is being created to run a wrestling tournament. **Public Production Url:** [https://wrestlingdev.com](https://wrestlingdev.com) **App Info** -* Ruby 3.2.0 +* Ruby 4.0.1 * Rails 8.1.2 * DB MySQL/MariaDB * Solid Cache -> MySQL/MariaDB for html partial caching diff --git a/config/application.rb b/config/application.rb index e40bbbf..49999da 100644 --- a/config/application.rb +++ b/config/application.rb @@ -57,6 +57,5 @@ module Wrestling config.active_support.cache_format_version = 7.1 config.load_defaults 8.1 - config.active_support.to_time_preserves_timezone = :zone end end diff --git a/deploy/rails-dev-Dockerfile b/deploy/rails-dev-Dockerfile index 4f6a2cd..6e09676 100644 --- a/deploy/rails-dev-Dockerfile +++ b/deploy/rails-dev-Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2.0 +FROM ruby:4.0.1 # Accept build arguments for user/group IDs ARG USER_ID=1000 diff --git a/deploy/rails-prod-Dockerfile b/deploy/rails-prod-Dockerfile index 6059263..b711c30 100644 --- a/deploy/rails-prod-Dockerfile +++ b/deploy/rails-prod-Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2.0-slim +FROM ruby:4.0.1-slim #HEALTHCHECK --start-period=60s CMD curl http://127.0.0.1/ @@ -15,6 +15,8 @@ RUN apt-get -qq update --fix-missing \ libsqlite3-dev \ wget \ default-libmysqlclient-dev \ + libyaml-dev \ + pkg-config \ nodejs \ tzdata \ git \