From f3e4940d6b830bc981764b0e4241f063297a87cc Mon Sep 17 00:00:00 2001 From: Joshua Coles Date: Wed, 4 Oct 2023 17:03:44 +0100 Subject: [PATCH] Upgrade Rails to 7.1 rc2 to allow `SECRET_KEY_BASE` to function --- Dockerfile | 5 +- Gemfile | 2 +- Gemfile.lock | 154 +++++++++++++++++++++++++++++---------------------- 3 files changed, 91 insertions(+), 70 deletions(-) diff --git a/Dockerfile b/Dockerfile index 66f003b..d5eac80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,8 +37,9 @@ RUN bundle exec bootsnap precompile app/ lib/ # Work around a bug in SASSC https://github.com/sass/sassc-ruby/issues/146 ENV BUNDLE_BUILD__SASSC=--disable-march-tune-native -RUN RAILS_ENV=production BUILD_STAGE=docker SECRET_KEY_BASE=1 ./bin/rails tailwindcss:build -RUN RAILS_ENV=production BUILD_STAGE=docker SECRET_KEY_BASE=1 ./bin/rails assets:precompile +# Depends on Rails 7.1 +RUN RAILS_ENV=production BUILD_STAGE=docker SECRET_KEY_BASE_DUMMY=1 ./bin/rails tailwindcss:build +RUN RAILS_ENV=production BUILD_STAGE=docker SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile # Final stage for app image diff --git a/Gemfile b/Gemfile index 482e533..8cbaea8 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.2.2" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" -gem "rails", "~> 7.0.7", ">= 7.0.7.2" +gem "rails", "7.1.0.rc2" # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] gem "sprockets-rails" diff --git a/Gemfile.lock b/Gemfile.lock index b1db0e1..163eeab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,70 +1,78 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + actioncable (7.1.0.rc2) + actionpack (= 7.1.0.rc2) + activesupport (= 7.1.0.rc2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + zeitwerk (~> 2.6) + actionmailbox (7.1.0.rc2) + actionpack (= 7.1.0.rc2) + activejob (= 7.1.0.rc2) + activerecord (= 7.1.0.rc2) + activestorage (= 7.1.0.rc2) + activesupport (= 7.1.0.rc2) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8) - actionpack (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activesupport (= 7.0.8) + actionmailer (7.1.0.rc2) + actionpack (= 7.1.0.rc2) + actionview (= 7.1.0.rc2) + activejob (= 7.1.0.rc2) + activesupport (= 7.1.0.rc2) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) - rack (~> 2.0, >= 2.2.4) + rails-dom-testing (~> 2.2) + actionpack (7.1.0.rc2) + actionview (= 7.1.0.rc2) + activesupport (= 7.1.0.rc2) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8) - actionpack (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.0.rc2) + actionpack (= 7.1.0.rc2) + activerecord (= 7.1.0.rc2) + activestorage (= 7.1.0.rc2) + activesupport (= 7.1.0.rc2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.1.0.rc2) + activesupport (= 7.1.0.rc2) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8) - activesupport (= 7.0.8) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.0.rc2) + activesupport (= 7.1.0.rc2) globalid (>= 0.3.6) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activestorage (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activesupport (= 7.0.8) + activemodel (7.1.0.rc2) + activesupport (= 7.1.0.rc2) + activerecord (7.1.0.rc2) + activemodel (= 7.1.0.rc2) + activesupport (= 7.1.0.rc2) + timeout (>= 0.4.0) + activestorage (7.1.0.rc2) + actionpack (= 7.1.0.rc2) + activejob (= 7.1.0.rc2) + activerecord (= 7.1.0.rc2) + activesupport (= 7.1.0.rc2) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8) + activesupport (7.1.0.rc2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) @@ -76,6 +84,8 @@ GEM kaminari (>= 1.0) sassc-rails (~> 2.1) selectize-rails (~> 0.6) + base64 (0.1.1) + bigdecimal (3.1.4) bindex (0.8.1) bootsnap (1.16.0) msgpack (~> 1.2) @@ -96,6 +106,8 @@ GEM debug (1.8.0) irb (>= 1.5.0) reline (>= 0.3.1) + drb (2.1.1) + ruby2_keywords erubi (1.12.0) ffi (1.16.2) font-awesome-sass (6.4.2) @@ -146,12 +158,12 @@ GEM net-smtp marcel (1.0.2) matrix (0.4.2) - method_source (1.0.0) mini_mime (1.1.5) minitest (5.20.0) msgpack (1.7.2) multi_xml (0.6.0) - net-imap (0.3.7) + mutex_m (0.1.2) + net-imap (0.4.0) date net-protocol net-pop (0.1.2) @@ -175,22 +187,27 @@ GEM nio4r (~> 2.0) racc (1.7.1) rack (2.2.8) + rack-session (1.0.1) + rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8) - actioncable (= 7.0.8) - actionmailbox (= 7.0.8) - actionmailer (= 7.0.8) - actionpack (= 7.0.8) - actiontext (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activemodel (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + rackup (1.0.0) + rack (< 3) + webrick + rails (7.1.0.rc2) + actioncable (= 7.1.0.rc2) + actionmailbox (= 7.1.0.rc2) + actionmailer (= 7.1.0.rc2) + actionpack (= 7.1.0.rc2) + actiontext (= 7.1.0.rc2) + actionview (= 7.1.0.rc2) + activejob (= 7.1.0.rc2) + activemodel (= 7.1.0.rc2) + activerecord (= 7.1.0.rc2) + activestorage (= 7.1.0.rc2) + activesupport (= 7.1.0.rc2) bundler (>= 1.15.0) - railties (= 7.0.8) + railties (= 7.1.0.rc2) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -198,13 +215,14 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) - method_source + railties (7.1.0.rc2) + actionpack (= 7.1.0.rc2) + activesupport (= 7.1.0.rc2) + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rake (13.0.6) rdoc (6.5.0) psych (>= 4.0.0) @@ -215,6 +233,7 @@ GEM reline (0.3.8) io-console (~> 0.5) rexml (3.2.6) + ruby2_keywords (0.0.5) rubyzip (2.3.2) sassc (2.4.0) ffi (~> 1.9) @@ -268,6 +287,7 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (~> 4.0, < 4.11) + webrick (1.8.1) websocket (1.2.10) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) @@ -293,7 +313,7 @@ DEPENDENCIES jbuilder pg (~> 1.1) puma (~> 5.0) - rails (~> 7.0.7, >= 7.0.7.2) + rails (= 7.1.0.rc2) redis (~> 4.0) selenium-webdriver sidekiq