Upgrade Ruby to 3.0.4 and Rails to 6.1.7 (#2233)

* Upgrade Ruby to 3.0.4 and Rails to 6.1.7 * Enable a few default configs * Keep the JS compressor Co-authored-by: Steven Lorek <[email protected]>
DFE-Digital · Oct 18, 2022 · ca3e7c7 · ca3e7c7
1 parent 8071c48
commit ca3e7c7
Show file tree

Hide file tree

Showing 32 changed files with 367 additions and 196 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.6
+3.0.4
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # ------------------------------------------------------------------------------
 # base
 # ------------------------------------------------------------------------------
-FROM ruby:2.7.6-alpine AS base
+FROM ruby:3.0.4-alpine AS base
 
 RUN addgroup -S appgroup && adduser -S appuser -G appgroup
 

diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,10 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "2.7.6"
+ruby "3.0.4"
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem "rails", "6.0.6"
+gem "rails", "6.1.7"
 # Use postgresql as the database for Active Record
 gem "pg", ">= 0.18", "< 2.0"
 # Use Puma as the app server
@@ -64,7 +64,7 @@ gem "httpclient"
 gem "daemons"
 
 # Gov form builder to structure claims
-gem "govuk_design_system_formbuilder"
+gem "govuk_design_system_formbuilder", "~> 2.8.0"
 
 # See https://github.com/typhoeus/ethon/issues/185
 gem "ethon", "~> 0.15.0"
@@ -91,8 +91,7 @@ gem "activerecord-copy", require: false
 gem "pagy"
 
 group :development, :test do
-  gem "amazing_print"
-  gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
+  gem "debug"
   gem "rspec-rails"
   gem "capybara"
   gem "brakeman", require: false