Upgrade Ruby from 3.0 => 3.1.4, Rails from 6.0 => 6.1.7

Author: mowsec

.ruby-version

@@ -1 +1 @@
-3.0.6
+3.1.4

Dockerfile

@@ -1,15 +1,15 @@
 # Multistage docker build which first builds and bundles all Ruby gems before 
 # creating build targets for the development and production images. 
 
-# SETUP
 # Default Ruby version for this project.
-ARG RUBY_VERSION=3.0.6
+ARG RUBY_VERSION=3.1.4
 
-# Base Alpine Ruby image for common setup
-FROM ruby:$RUBY_VERSION-alpine as base
+# BASE STAGE
+# Create a base ruby-alpine stage with common configuration
+# that can be used in all other stages.
+FROM ruby:$RUBY_VERSION-alpine as ruby-alpine
 
-# Set some environment variables
-# ENV BUNDLER_VERSION=2.4.4
+# Set environment variables to be shared across all stages.
 ENV GEM_HOME=/usr/local/bundle
 ENV BUNDLE_PATH=$GEM_HOME
 ENV BUNDLE_APP_CONFIG=$BUNDLE_PATH
@@ -21,8 +21,10 @@ RUN apk add --no-cache \
     nodejs \
     tzdata
 
-# Builder stage for building Ruby gems
-FROM base as builder
+# BUILDER STAGE
+# Build all gems and dependencies in a builder stage, 
+# whch can then be copied to other stages.
+FROM ruby-alpine as builder
 
 # Add packages for required for building
 RUN apk add --no-cache \
@@ -37,42 +39,35 @@ WORKDIR /app
 # Copy the Gemfile and Gemfile.lock files to the current directory.
 COPY Gemfile* .
 
-# Install bundler with specified version.
-# RUN gem install bundler -v $BUNDLER_VERSION
-
-# Install gems and remove any unnecessary files from gems. 
+# Install gems and remove any unnecessary build artifacts. 
 RUN bundle config force_ruby_platform true \
     && bundle install --jobs 4 --retry 3 \ 
     && rm -rf $BUNDLE_PATH/cache/*.gem \
-    && rm -rf $BUNDLE_PATH/ruby/*/cache 
-    # && find $BUNDLE_PATH/gems/ -name "*.c" -delete \
-    # && find $BUNDLE_PATH/gems/ -name "*.o" -delete
-
+    && rm -rf $BUNDLE_PATH/ruby/*/cache
 
 # RUNNER STAGE 
-FROM base as runner
+# Copy the needed gems and dependenies from the builder stage to 
+# create the final minimal image for running the app.
+FROM ruby-alpine as runner
 
+# Add packages required for running the app
 RUN apk add --no-cache \
+    chromium \
+    chromium-chromedriver \
     libpq \
     mariadb
 
+# Set the working directory for the app.
 WORKDIR /app
 
 # Copy the bundle directory from the "builder" image 
 # and copy all other files to the current directory. 
 COPY --from=builder $BUNDLE_PATH $BUNDLE_PATH
 COPY . . 
 
-# Recreate, migrate and seed the database from scratch 
-# each time the container is built
-# RUN rm db/development.sqlite3 db/test.sqlite3 \
-#     && bundle exec rails db:setup
-
 # Expose port 3000 for the application.
 EXPOSE 3000
 
 # Run the command to start the Rails server.
-# ENTRYPOINT ["/bin/bash"]
-CMD ["bundle", "exec", "rails", "server", "-p", "3000", "-b", "0.0.0.0"]
-
-
+ENTRYPOINT ["/bin/sh"]
+CMD ["/app/entrypoint.sh"]

Gemfile

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "rails", "6.0.6"
+gem "rails", "6.1.7"
 
-ruby "3.0.6"
+ruby "3.1.4"
 
-gem "websocket-driver"
+# Add the Contrast Agent gem
+gem "contrast-agent"
 
 gem "aruba"
 gem "bcrypt"
@@ -29,6 +30,7 @@ gem "sqlite3"
 gem "turbolinks"
 gem "uglifier"
 gem "unicorn"
+gem "websocket-driver"
 
 # Add SMTP server support using MailCatcher
 # NOTE: https://github.com/sj26/mailcatcher#bundler

Gemfile.lock

@@ -1,61 +1,65 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.6)
-      actionpack (= 6.0.6)
+    actioncable (6.1.7)
+      actionpack (= 6.1.7)
+      activesupport (= 6.1.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.6)
-      actionpack (= 6.0.6)
-      activejob (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
+    actionmailbox (6.1.7)
+      actionpack (= 6.1.7)
+      activejob (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
       mail (>= 2.7.1)
-    actionmailer (6.0.6)
-      actionpack (= 6.0.6)
-      actionview (= 6.0.6)
-      activejob (= 6.0.6)
+    actionmailer (6.1.7)
+      actionpack (= 6.1.7)
+      actionview (= 6.1.7)
+      activejob (= 6.1.7)
+      activesupport (= 6.1.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.6)
-      actionview (= 6.0.6)
-      activesupport (= 6.0.6)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.7)
+      actionview (= 6.1.7)
+      activesupport (= 6.1.7)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.6)
-      actionpack (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
+    actiontext (6.1.7)
+      actionpack (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
       nokogiri (>= 1.8.5)
-    actionview (6.0.6)
-      activesupport (= 6.0.6)
+    actionview (6.1.7)
+      activesupport (= 6.1.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.6)
-      activesupport (= 6.0.6)
+    activejob (6.1.7)
+      activesupport (= 6.1.7)
       globalid (>= 0.3.6)
-    activemodel (6.0.6)
-      activesupport (= 6.0.6)
-    activerecord (6.0.6)
-      activemodel (= 6.0.6)
-      activesupport (= 6.0.6)
-    activestorage (6.0.6)
-      actionpack (= 6.0.6)
-      activejob (= 6.0.6)
-      activerecord (= 6.0.6)
+    activemodel (6.1.7)
+      activesupport (= 6.1.7)
+    activerecord (6.1.7)
+      activemodel (= 6.1.7)
+      activesupport (= 6.1.7)
+    activestorage (6.1.7)
+      actionpack (= 6.1.7)
+      activejob (= 6.1.7)
+      activerecord (= 6.1.7)
+      activesupport (= 6.1.7)
       marcel (~> 1.0)
-    activesupport (6.0.6)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     aruba (2.1.0)
@@ -99,6 +103,12 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.2.2)
     contracts (0.17)
+    contrast-agent (7.3.0)
+      contrast-agent-lib (= 1.1.1)
+      ffi (~> 1.0)
+      ougai (>= 1.8, < 3.0.0)
+      rack (~> 2.0)
+    contrast-agent-lib (1.1.1)
     crass (1.0.6)
     cucumber (8.0.0)
       builder (~> 3.2, >= 3.2.4)
@@ -233,6 +243,9 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    oj (3.15.1)
+    ougai (2.0.0)
+      oj (~> 3.10)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
@@ -254,20 +267,20 @@ GEM
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.0.6)
-      actioncable (= 6.0.6)
-      actionmailbox (= 6.0.6)
-      actionmailer (= 6.0.6)
-      actionpack (= 6.0.6)
-      actiontext (= 6.0.6)
-      actionview (= 6.0.6)
-      activejob (= 6.0.6)
-      activemodel (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
-      bundler (>= 1.3.0)
-      railties (= 6.0.6)
+    rails (6.1.7)
+      actioncable (= 6.1.7)
+      actionmailbox (= 6.1.7)
+      actionmailer (= 6.1.7)
+      actionpack (= 6.1.7)
+      actiontext (= 6.1.7)
+      actionview (= 6.1.7)
+      activejob (= 6.1.7)
+      activemodel (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
+      bundler (>= 1.15.0)
+      railties (= 6.1.7)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.1.1)
       activesupport (>= 5.0.0)
@@ -277,12 +290,12 @@ GEM
       loofah (~> 2.21)
       nokogiri (~> 1.14)
     rails-perftest (0.0.7)
-    railties (6.0.6)
-      actionpack (= 6.0.6)
-      activesupport (= 6.0.6)
+    railties (6.1.7)
+      actionpack (= 6.1.7)
+      activesupport (= 6.1.7)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.1.1)
     raindrops (0.20.1)
     rake (13.0.6)
@@ -307,14 +320,14 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (5.1.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
+    rspec-rails (6.0.3)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
     rspec-support (3.12.1)
     rubocop (1.55.1)
       json (~> 2.3)
@@ -371,16 +384,15 @@ GEM
     test-unit (3.6.1)
       power_assert
     thor (1.2.2)
-    thread_safe (0.3.6)
     tilt (2.2.0)
     timeout (0.4.0)
     travis-lint (2.0.0)
       json
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.4.2)
@@ -407,6 +419,7 @@ DEPENDENCIES
   bundler-audit
   capybara
   coffee-rails
+  contrast-agent
   cuprite
   database_cleaner
   execjs
@@ -424,7 +437,7 @@ DEPENDENCIES
   pry-rails
   puma
   rack-livereload
-  rails (= 6.0.6)
+  rails (= 6.1.7)
   rails-perftest
   rake
   rb-fsevent
@@ -443,7 +456,7 @@ DEPENDENCIES
   websocket-driver
 
 RUBY VERSION
-   ruby 3.0.6p216
+   ruby 3.1.4p223
 
 BUNDLED WITH
-   2.2.33
+   2.3.26