Update the 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
@@ -26,6 +27,10 @@
 !/tmp/pids/.keep
 
 # Ignore storage (uploaded files in development and any SQLite databases).
+/db/*.sqlite3
+/public/system
+/public/uploads
+/public/vite
 /storage/*
 !/storage/.keep
 /tmp/storage/*

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.1
+FROM ruby:$RUBY_VERSION-slim AS base
 
 LABEL fly_launch_runtime="rails"
 
@@ -30,17 +30,18 @@ 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 ./
+# Copy application code
+COPY --link . .
+
 RUN sed -i "s/, path: '..\/..\/'//" Gemfile
 RUN bundle install && \
     rm -rf ~/.bundle/ $BUNDLE_PATH/ruby/*/cache $BUNDLE_PATH/ruby/*/bundler/gems/*/.git
@@ -49,21 +50,16 @@ RUN bundle install && \
 # 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
-
+RUN SECRET_KEY_BASE=DUMMY ./bin/rails assets:precompile db:setup
 
 # Final stage for app image
 FROM base
 
 # Install packages needed for deployment
 RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y curl default-mysql-client imagemagick libsqlite3-0 libvips postgresql-client && \
+    apt-get install --no-install-recommends -y curl imagemagick libsqlite3-0 libvips && \
     rm -rf /var/lib/apt/lists /var/cache/apt/archives
 
 # Copy built artifacts: gems, application
@@ -72,12 +68,14 @@ COPY --from=build /rails /rails
 
 # Run and own only the runtime files as a non-root user for security
 RUN useradd rails --create-home --shell /bin/bash && \
+    mkdir public/system public/uploads && \
     chown -R rails:rails db log tmp public/system public/uploads
 USER rails:rails
 
 # Deployment options
 ENV RAILS_LOG_TO_STDOUT="1" \
-    RAILS_SERVE_STATIC_FILES="true"
+    RAILS_SERVE_STATIC_FILES="true" \
+    RAILS_MAX_THREADS="1"
 
 # Entrypoint prepares the database.
 ENTRYPOINT ["/rails/bin/docker-entrypoint"]

spec/dummy_app/Gemfile

@@ -6,33 +6,36 @@ gem 'rails', '>= 7.0.0'
 
 group :active_record do
   platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter', '>= 1.2'
-    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2'
+    gem 'activerecord-jdbcmysql-adapter', '>= 1.2' if ENV['CI_DB_ADAPTER'] == 'mysql2'
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2' if ENV['CI_DB_ADAPTER'] == 'postgresql'
     gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2'
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'mysql2', '>= 0.3.14'
-    gem 'pg', '>= 0.14'
+    gem 'mysql2', '>= 0.3.14' if ENV['CI_DB_ADAPTER'] == 'mysql2'
+    gem 'pg', '>= 0.14' if ENV['CI_DB_ADAPTER'] == 'postgresql'
     gem 'sqlite3', '>= 1.3.0'
   end
 
   gem 'paper_trail', '>= 12.0'
 end
 
 gem 'carrierwave', '>= 2.0.0.rc', '< 3.0'
-gem 'cssbundling-rails', require: false
 gem 'devise', '>= 3.2'
 gem 'dragonfly', '~> 1.0'
-gem 'importmap-rails', require: false
 gem 'mini_magick', '>= 3.4'
 gem 'mlb', '>= 0.7'
 gem 'paperclip', '>= 3.4'
+gem 'puma'
 gem 'rails_admin', path: '../../'
 gem 'shrine', '~> 3.0'
-gem 'vite_rails', require: false
-gem 'webpacker', require: false
-gem 'webrick'
+
+group :development, :test do
+  gem 'cssbundling-rails', require: false
+  gem 'importmap-rails', require: false
+  gem 'vite_rails', require: false
+  gem 'webpacker', require: false
+end
 
 # Gems used only for assets and not required
 # in production environments by default.

spec/dummy_app/bin/docker-entrypoint

@@ -1,8 +1,3 @@
 #!/bin/bash -e
 
-# If running the rails server then create or migrate existing database
-if [ "${*}" == "./bin/rails server" ]; then
-  ./bin/rails db:create db:migrate db:seed
-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/environments/production.rb

@@ -50,7 +50,7 @@
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
-  config.log_level = :debug
+  config.log_level = :info
 
   # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :request_id ]
@@ -82,4 +82,7 @@
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  # Disable yjit to save memory.
+  config.yjit = false
 end

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

spec/dummy_app/config/puma.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+threads 0, ENV.fetch("RAILS_MAX_THREADS", 3)
+port ENV.fetch("PORT", 3000)