Staging R7 to Prod

.github/workflows/deploy.yml

@@ -113,7 +113,7 @@ jobs:
       - name: Run specs
         run: |
           docker run -d --name="test-database" --hostname "mysql" -e "MYSQL_PASSWORD=test" -e "MYSQL_USER=test" -e "MYSQL_ROOT_PASSWORD=test" -p 127.0.0.1:3306:3306/tcp mysql:5.7
-          docker run --network "container:test-database" -e RAILS_ENV=test -e DEVISE_SECRET=${{ env.DEVISE_SECRET }} -e SECRET_KEY_BASE=${{ env.SECRET_KEY_BASE }} -e "MYSQL_PASSWORD=test" -e "RAILS_MYSQL_USER=root" -e "BASE_URL=localhost:3000" ${{ env.TEST_TAG }} /bin/sh -c "bundle exec rake db:create db:setup; bundle exec rake db:seed; bundle exec rspec"
+          docker run --network "container:test-database" -e DB_HOST=mysql -e RAILS_ENV=test -e DEVISE_SECRET=${{ env.DEVISE_SECRET }} -e SECRET_KEY_BASE=${{ env.SECRET_KEY_BASE }} -e "MYSQL_PASSWORD=test" -e "RAILS_MYSQL_USER=root" -e "BASE_URL=localhost:3000" ${{ env.TEST_TAG }} /bin/sh -c "bin/rails db:create; bin/rails db:setup; bin/rails db:seed; bundle exec rspec"
 
       #
       - name: Run security tests

.gitignore

@@ -67,3 +67,11 @@ yarn-error.log*
 /node_modules
 yarn-debug.log*
 .yarn-integrity
+
+# Vite Ruby
+/public/vite*
+node_modules
+# Vite uses dotenv and suggests to ignore local-only env files. See
+# https://vitejs.dev/guide/env-and-mode.html#env-files
+*.local
+

.ruby-version

@@ -1 +1 @@
-ruby-2.7.3
+ruby-3.1.2

Dockerfile-dev

@@ -2,7 +2,7 @@
 
 # Use ruby image to build our own image
 # TODO: change based when we change version of ruby
-FROM --platform=linux/x86_64 ruby:2.7.3-alpine as base
+FROM --platform=linux/x86_64 ruby:3.1.2-alpine as base
 
 # Ensure that we work in UTF 8
 ENV LANG C.UTF-8 # ensure that the encoding is UTF8
@@ -34,9 +34,7 @@ RUN apk add \
     && rm -rf /var/cache/apk/*
 
 # Install bundler for this Docker image
-# RUN gem install bundler:2.2.4
-# TODO: ensure that version of bundler matches what we want
-RUN gem install bundler:1.17.3
+RUN gem install bundler:2.3.26
 
 # pre-install bundle for speed later
 ADD ./Gemfile /opt/draw/Gemfile

Dockerfile-prod

@@ -2,7 +2,7 @@
 
 # Use ruby image to build our own image
 # TODO: change based when we change version of ruby
-FROM --platform=linux/x86_64 ruby:2.7.3-alpine as base
+FROM --platform=linux/x86_64 ruby:3.1.2-alpine as base
 
 # Ensure that we work in UTF 8
 ENV LANG C.UTF-8 # ensure that the encoding is UTF8
@@ -33,20 +33,19 @@ RUN apk add \
     && rm -rf /var/cache/apk/*
 
 # Install bundler for this Docker image
-# TODO: ensure that version of bundler matches what we want
-RUN gem install bundler:1.17.3
+RUN gem install bundler:2.3.26
 
 # WORKDIR /setup
 ADD . /opt/draw
 WORKDIR /opt/draw
 
 # Just not use dev here
+# TODO: we need to check this
 RUN bin/bundle install --without development
-RUN bin/yarn install --frozen-lockfile
+RUN bin/vite install
 
 # The pre-compile will be done as part of the deploy of the image
 # The precompile will also deal with the webpacker assets
-# RUN bin/rake assets:precompile --trace
 
 # We expose the port
 EXPOSE 3000

Gemfile

@@ -1,20 +1,19 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.3'
+ruby "3.1.2"
 
-gem 'rails', '~> 6.1'
+gem "rails", "~> 7.0.4"
 
 gem 'mysql2'
 
-gem 'mime-types', require: 'mime/types/full'
-
 gem 'paper_trail'
 gem "ranked-model"
 
 gem 'uglifier'
 
 #bootstrap stuff
-gem 'sass-rails'
+# gem 'sass-rails'
 
 gem 'log4r'
 
@@ -30,7 +29,7 @@ gem 'simple_form'
 gem 'will_paginate'
 
 #for attachments
-gem 'paperclip'
+gem 'kt-paperclip'
 
 gem 'with_advisory_lock'
 
@@ -44,17 +43,17 @@ gem 'routing-filter'
 
 gem 'http_accept_language'
 
-gem 'rails-i18n'
+gem 'rails-i18n', '~> 7.0.0'
 gem 'i18n-active_record', :require => 'i18n/active_record'
 # gem 'i18n-tasks'
 
 gem 'rails-observers'
 
 gem 'friendly_id', '~> 5.4.2'
-gem 'mobility', '~> 1.0.3'
-gem 'friendly_id-mobility', '~> 1.0.3'
+# gem 'mobility', '~> 1.0.3'
+# gem 'friendly_id-mobility', '~> 1.0.3'
 
-gem 'globalize', '~> 6.0' # TODO: change when Rails upgrades
+gem 'globalize'
 gem 'globalize-accessors'
 
 gem "sidekiq"
@@ -64,32 +63,33 @@ gem "sidekiq-scheduler"
 # gem 'bcrypt-ruby', '~> 3.0.0'
 gem 'newrelic_rpm'
 
-gem 'puma', '>= 5.0'
+# gem 'puma', '~> 5.0'
+gem 'puma', '~> 6.3.1'
 
 gem "recaptcha", require: "recaptcha/rails"
 
-gem 'bootsnap', '>= 1.4.4', require: false
+# gem 'bootsnap', require: false
+
+# gem 'websocket-extensions', '~> 0.1.5'
 
-# gem 'webpacker', '~> 3.5'
-gem 'webpacker', '~> 5.0'
-gem 'websocket-extensions', '~> 0.1.5'
+gem "cssbundling-rails", "~> 1.1"
 
 group :development do
   gem "better_errors"
   gem "binding_of_caller"
 
   gem "byebug"
-  gem "rails-erd"
+  # gem "rails-erd"
   gem 'rb-readline'
   gem 'rubocop'
   gem 'rack-mini-profiler'
   gem 'rbtrace'
 
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem 'web-console', '>= 3.3.0'
+  gem 'web-console'
   # 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.1.0'
+  # gem 'spring'
+  # gem 'spring-watcher-listen', '~> 2.1.0'
 end
 
 group :development, :test do
@@ -116,3 +116,9 @@ end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+gem "vite_rails", "~> 3.0"
+gem 'vite_plugin_legacy'
+
+gem "haml-rails"
+# gem "sassc-rails"