Merge pull request #82 from LD4P/dev

Merge dev to main

.dockerignore

@@ -10,7 +10,6 @@
 /.git
 /.gitignore
 /.rspec
-/.rubocop*
 /.qa_server_app
 
 /coverage/*

.env.example

@@ -58,10 +58,10 @@ MYSQL_ROOT_PASSWORD=CHANGEME
 ## --------------------
 PREFERRED_TIME_ZONE_NAME=Eastern Time (US & Canada)
 DISPLAY_HISTORICAL_DATA=true
-HISTORICAL_DATA_DEFAULT_TIME_PERIOD=:month
+HISTORICAL_DATA_DEFAULT_TIME_PERIOD=month
 DISPLAY_PERFORMANCE_GRAPH=false
 DISPLAY_PERFORMANCE_DATATABLE=false
-PERFORMANCE_DATA_DEFAULT_TIME_PERIOD=:month
+PERFORMANCE_DATA_DEFAULT_TIME_PERIOD=month
 SUPPRESS_PERFORMANCE_LOGGING=true
 MONITOR_STATUS_LOGGING_ENABLED=false
 

Dockerfile

@@ -1,5 +1,6 @@
-ARG RUBY_VERSION=2.7.3
+ARG RUBY_VERSION=3.1.2
 FROM ruby:$RUBY_VERSION-alpine
+ARG BUNDLER_VERSION=2.3.7
 
 ## Install dependencies:
 ## - build-base: To ensure certain gems can be compiled
@@ -9,6 +10,7 @@ FROM ruby:$RUBY_VERSION-alpine
 ## - tzdata: add time zone support
 ## - mariadb-dev: To allow use of MySQL2 gem
 ## - imagemagick: for image processing
+## - gcompat: to avoid architecture-specific incompatibitilies
 RUN apk add --update --no-cache \
       bash \
       build-base \
@@ -17,17 +19,19 @@ RUN apk add --update --no-cache \
       sqlite-dev \
       tzdata \
       mariadb-dev \
-      imagemagick6-dev imagemagick6-libs
+      imagemagick6-dev imagemagick6-libs \
+      gcompat
 
 
 WORKDIR /app/ld4p/qa_server-webapp
 
-RUN gem install bundler:2.1.4
+RUN gem install bundler:${BUNDLER_VERSION}
 
 ENV PATH="/app/ld4p/qa_server-webapp:$PATH"
 ENV RAILS_ROOT="/app/ld4p/qa_server-webapp"
 
 COPY Gemfile Gemfile.lock ./
+
 RUN gem update --system
 RUN bundle install
 

Gemfile

@@ -1,16 +1,16 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.3'
+ruby '3.1.2'
 
 # rubocop:disable Bundler/OrderedGems
 ## Gems adds by `rails new`
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.5'
+gem 'rails', '~> 7.0.8'
 # Use sqlite3 as the database for Active Record
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.4.4'
 # Use Puma as the app server
-gem 'puma', '~> 5.6.4'
+gem 'puma', '>= 5.6.4', '~>6.4.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
@@ -19,11 +19,11 @@ gem 'uglifier', '>= 1.3.0'
 # gem 'mini_racer', platforms: :ruby
 
 # Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2'
+gem 'coffee-rails', '~> 5.0.0'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.5'
+gem 'jbuilder', '~> 2.10'
 # Use Redis adapter to run Action Cable in production
 # gem 'redis', '~> 4.0'
 # Use ActiveModel has_secure_password
@@ -36,7 +36,7 @@ gem 'jbuilder', '~> 2.5'
 # gem 'capistrano-rails', group: :development
 
 # Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.1.0', require: false
+gem 'bootsnap', '~> 1.16', require: false
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -46,7 +46,7 @@ end
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
-  gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'listen', '>= 3.0.5', '< 3.9'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
@@ -65,9 +65,12 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 ## Gems manually added to for qa and qa_server engines
 # Required gems for QA and linked data access
-gem 'qa_server', '~> 7.5'
-gem 'qa', '~> 5.5'
+# NOTE: We need to update the published RubyGems version of qa_server with the 8.0 release. Until
+# then, the next entry is set to use the GitHub repo and tag instead.
+gem 'qa_server', git: 'https://github.com/LD4P/qa_server.git', tag: 'v8.0.1'
+gem 'qa', '~> 5.10'
 gem 'linkeddata'
+gem 'psych', '~> 5.1'
 
 ## Gems added for application customization
 # support for .env file
@@ -87,13 +90,18 @@ group :development, :integration, :test do
 end
 
 group :development, :integration do
-  gem 'xray-rails' # overlay showing which files are contributing to the UI
+  # gem 'xray-rails' # overlay showing which files are contributing to the UI
+  # This gem doesn't work with Ruby 3.x unless a special branch is used (see
+  # https://github.com/brentd/xray-rails/pull/108). There is a PR to merge the fix
+  # into the master branch, but the gem's authors don't seem to be in a hurry to
+  # finish the work.
+  gem "xray-rails", git: "https://github.com/brentd/xray-rails.git", branch: "bugs/ruby-3.0.0"
 end
 
 group :development do
   gem 'better_errors' # add command line in browser when errors
   gem 'binding_of_caller' # deeper stack trace used by better errors
-  gem 'bixby', '~> 3.0' # style guide enforcement with rubocop
+  gem 'bixby', '~> 5.0' # style guide enforcement with rubocop
   gem 'rubocop-checkstyle_formatter', require: false
 end