Update Live demo

Author: mshibuya

.github/workflows/test.yml

@@ -150,7 +150,7 @@ jobs:
         run: |
           yarn install
           cd spec/dummy_app
-          bundle exec rake rails_admin:prepare_ci_env db:create db:migrate
+          bundle exec rake rails_admin:prepare_ci_env db:create db:schema:load
           yarn install
           case "$CI_ASSET" in
           "webpack" ) yarn build && yarn build:css ;;

.gitignore

@@ -24,7 +24,6 @@ log/*.log
 pkg/*
 spec/dummy_app/db/*.sqlite3
 spec/dummy_app/db/*.sqlite3-journal
-spec/dummy_app/db/schema.rb
 spec/dummy_app/log/*.log
 spec/dummy_app/public/uploads
 spec/dummy_app/Gemfile*.lock

spec/dummy_app/.dockerignore

@@ -3,8 +3,9 @@
 # Ignore git directory.
 /.git/
 
-# Ignore bundler config.
+# Ignore bundler config and Gemfile.lock.
 /.bundle
+/Gemfile.lock
 
 # Ignore all default key files.
 /config/master.key

spec/dummy_app/Dockerfile

@@ -1,8 +1,8 @@
 # syntax = docker/dockerfile:1
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.1.2
-FROM ruby:$RUBY_VERSION-slim as base
+ARG RUBY_VERSION=3.2
+FROM ruby:$RUBY_VERSION-slim AS base
 
 LABEL fly_launch_runtime="rails"
 
@@ -30,29 +30,27 @@ RUN apt-get update -qq && \
 #     rm -rf /tmp/node-build-master
 
 # Throw-away build stage to reduce size of final image
-FROM base as build
+FROM base AS build
 
 # Install packages needed to build gems and node modules
 RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y build-essential default-libmysqlclient-dev git libpq-dev libvips node-gyp pkg-config python-is-python3
+    apt-get install --no-install-recommends -y build-essential default-libmysqlclient-dev git libpq-dev libvips libyaml-dev node-gyp pkg-config python-is-python3
 
 # Build options
 ENV PATH="/usr/local/node/bin:$PATH"
 
-# Install application gems
-COPY --link Gemfile ./
-RUN sed -i "s/, path: '..\/..\/'//" Gemfile
+# Copy application code
+COPY --link . .
+
+# Install application gems. Using Rails 7 for now, as 8 seems to consume more memory.
+RUN sed -i "s/, path: '..\/..\/'//" Gemfile && sed -i "s/'rails', '>= 7.0.0'/'rails', '~> 7.0'/" Gemfile
 RUN bundle install && \
     rm -rf ~/.bundle/ $BUNDLE_PATH/ruby/*/cache $BUNDLE_PATH/ruby/*/bundler/gems/*/.git
 
 # Install node modules
 # COPY --link package.json ./
 # RUN npm install
 
-# Copy application code
-COPY --link . .
-RUN sed -i "s/, path: '..\/..\/'//" Gemfile
-
 # Precompiling assets for production without requiring secret RAILS_MASTER_KEY
 RUN sed -i "/link_tree ..\/..\/..\//d" app/assets/config/manifest.js
 RUN SECRET_KEY_BASE=DUMMY ./bin/rails assets:precompile

spec/dummy_app/bin/docker-entrypoint

@@ -2,7 +2,7 @@
 
 # If running the rails server then create or migrate existing database
 if [ "${*}" == "./bin/rails server" ]; then
-  ./bin/rails db:create db:migrate db:seed
+  ./bin/rails db:setup
 fi
 
 exec "${@}"

spec/dummy_app/config/application.rb

@@ -37,6 +37,7 @@ class Application < Rails::Application
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
     config.load_defaults Rails.version[0, 3]
+    (CI_TARGET_ORMS - [CI_ORM]).each {|orm| config.paths.add "app/#{orm}", eager_load: false }
     config.eager_load_paths = (config.try(:all_eager_load_paths) || config.eager_load_paths).reject { |p| p =~ %r{/app/([^/]+)} && !%W[controllers jobs locales mailers #{CI_ORM}].include?(Regexp.last_match[1]) }
     config.eager_load_paths += %W[#{config.root}/app/eager_loaded]
     config.autoload_paths += %W[#{config.root}/lib]

spec/dummy_app/config/boot.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 CI_ORM = (ENV['CI_ORM'] || :active_record).to_sym unless defined?(CI_ORM)
+CI_TARGET_ORMS = %i[active_record mongoid].freeze
 CI_ASSET = (ENV['CI_ASSET'] || :sprockets).to_sym unless defined?(CI_ASSET)
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 

spec/dummy_app/config/initializers/rails_admin.rb

@@ -16,5 +16,10 @@
         visible false
       end
     end
+    c.model 'League' do
+      configure :players do
+        visible false
+      end
+    end
   end
 end