Merge pull request #319 from sosol/rails-7

Rails 7

.github/workflows/rails-tests.yml

@@ -58,9 +58,9 @@ jobs:
         DATABASE_HOSTNAME: localhost
         DATABASE_POOL: 16
     - name: Upload test logs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: logs
+        name: logs-${{ matrix.runs-on }}
         path: log
         retention-days: 1

Dockerfile

@@ -1,5 +1,5 @@
-FROM ubuntu:jammy
-MAINTAINER Ryan Baumann <[email protected]>
+FROM debian:bullseye
+LABEL org.opencontainers.image.authors="Ryan Baumann <[email protected]>"
 
 # Install the Ubuntu packages.
 # Install Ruby, RubyGems, Bundler, MySQL, Git, wget, svn, java
@@ -12,7 +12,7 @@ RUN apt-get update && \
   openjdk-11-jre
 
 # Set the locale.
-RUN locale-gen en_US.UTF-8
+RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
@@ -33,7 +33,8 @@ RUN git clone https://github.com/rbenv/rbenv-vars.git $(rbenv root)/plugins/rben
 
 ADD . /root/sosol/
 WORKDIR /root/sosol
-RUN rbenv install && rbenv rehash && gem install bundler:2.2.32 && rbenv rehash && bundle install && jruby -v && java -version && touch config/environments/development_secret.rb config/environments/production_secret.rb config/environments/test_secret.rb
+RUN rbenv install && rbenv rehash && gem install bundler:2.5.23 && rbenv rehash && bundle install && jruby -v && java -version && touch config/environments/development_secret.rb config/environments/production_secret.rb config/environments/test_secret.rb
+RUN bundle exec cap local externals:setup
 # RUN RAILS_ENV=test ./script/setup
 
 # Finally, start the application

Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 ruby '3.1.4', engine: 'jruby', engine_version: '9.4.9.0'
 
-gem 'rails', '~> 6.1.5'
+gem 'rails', '~> 7.0', '< 7.1'
 
 # Needed for the new asset pipeline
 gem 'coffee-rails'
@@ -32,13 +32,14 @@ end
 gem 'haml-rails', '~> 2.0'
 gem 'jquery-rails'
 gem 'jruby-jars', File.read('.ruby-version').chomp.sub(/^jruby-/, '')
+gem 'logger'
 gem 'sass'
 # gem 'json-jruby', '>= 1.6.6', :require => 'json', :platform => :jruby
 gem 'actionpack-page_caching'
-gem 'activerecord-jdbc-adapter', '>= 61.3', '~> 61', platform: :jruby
-gem 'activerecord-jdbcmysql-adapter', '>= 61.3', '~> 61', platform: :jruby
-gem 'activerecord-jdbcpostgresql-adapter', '>= 61.3', '~> 61', platform: :jruby
-gem 'activerecord-jdbcsqlite3-adapter', '>= 61.3', '~> 61', platform: :jruby
+gem 'activerecord-jdbc-adapter', '>= 61.3', '~> 70', platform: :jruby
+gem 'activerecord-jdbcmysql-adapter', '>= 61.3', '~> 70', platform: :jruby
+gem 'activerecord-jdbcpostgresql-adapter', '>= 61.3', '~> 70', platform: :jruby
+gem 'activerecord-jdbcsqlite3-adapter', '>= 61.3', '~> 70', platform: :jruby
 gem 'activerecord-session_store'
 gem 'airbrake'
 gem 'airbrake-ruby', '6.2.0'