Merge pull request #130 from JudahSan/FT/rails8

Upgrade to Rails 8 from the previous version

Author: adamswonder

.devcontainer/Dockerfile

@@ -1,3 +1,3 @@
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version
-ARG RUBY_VERSION=3.4.1
+ARG RUBY_VERSION=3.4.4
 FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION

Dockerfile

@@ -1,33 +1,88 @@
-FROM ruby:3.4.1-alpine
+# syntax=docker/dockerfile:1
+# Multi-stage Dockerfile for Rails 8 app with Ruby 3.4.4
 
-ENV APP_PATH /var/app
-ENV BUNDLE_VERSION 2.3.1
-ENV BUNDLE_PATH /usr/local/bundle/gems
-ENV TMP_PATH /tmp/
-ENV RAILS_LOG_TO_STDOUT true
-ENV RAILS_PORT 3000
+ARG RUBY_VERSION=3.4.4
 
-# Install system dependencies
-RUN apt-get update && apt-get install -y \
-    build-essential \
-    git \
-    postgresql-client \
-    libxml2-dev \
-    libxslt-dev \
-    nodejs \
-    npm \
+# Base image with Ruby and system libs
+FROM ruby:${RUBY_VERSION}-slim AS base
+ENV APP_PATH=/rails \
+    RAILS_LOG_TO_STDOUT=true \
+    RAILS_SERVE_STATIC_FILES=true
+WORKDIR ${APP_PATH}
+
+# Install runtime deps
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y \
+    curl \
+    ca-certificates \
+    libpq5 \
     imagemagick \
+    libvips \
     tzdata \
-    less \
-    && rm -rf /var/lib/apt/lists/* \
-    && mkdir -p $APP_PATH
+    git \
+    postgresql-client && \
+    rm -rf /var/lib/apt/lists/*
+
+# Builder stage for gems, node modules, and assets
+FROM base AS build
+
+# Build toolchain and headers
+RUN apt-get update -qq && apt-get install --no-install-recommends -y \
+    build-essential \
+    libpq-dev \
+    pkg-config \
+    python3 \
+    node-gyp \
+    libyaml-dev && rm -rf /var/lib/apt/lists/*
+
+# Install Node.js and Yarn (Node 20 LTS)
+ARG NODE_VERSION=20
+RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \
+    apt-get install -y nodejs && \
+    npm install -g [email protected]
+
+
+# Bundle install
+COPY Gemfile Gemfile.lock ./
+ENV BUNDLE_PATH=/usr/local/bundle \
+    BUNDLE_DEPLOYMENT=1
+ARG BUNDLER_VERSION=2.7.2
+RUN gem update --system --no-document && \
+    gem install -N bundler -v ${BUNDLER_VERSION} && \
+    bundle install && \
+    bundle exec bootsnap precompile --gemfile && \
+    rm -rf ~/.bundle/ $BUNDLE_PATH/ruby/*/cache $BUNDLE_PATH/ruby/*/bundler/gems/*/.git
+
+# JS deps
+COPY package.json yarn.lock ./
+RUN yarn install --frozen-lockfile
+
+# App code
+COPY . .
+
+# Precompile bootsnap and assets
+RUN bundle exec bootsnap precompile app/ lib/
+# If using sprockets, keep assets:precompile; js/cssbundling will run via rake task
+RUN ./bin/rails assets:precompile
+
+# Final image
+FROM base AS app
+
+# Copy built artifacts
+COPY --from=build /usr/local/bundle /usr/local/bundle
 
-RUN gem install bundler --version "$BUNDLE_VERSION" \
-    && rm -rf $GEM_HOME/cache/*
+# Set bundle and gem paths for runtime
+ENV BUNDLE_PATH=/usr/local/bundle \
+    GEM_HOME=/usr/local/bundle \
+    BUNDLE_DEPLOYMENT=1
 
-# navigate to app directory
-WORKDIR $APP_PATH
+# Non-root user
+RUN useradd -u 1000 -m rails && chown -R rails:rails /rails /usr/local/bundle
+USER rails
 
-EXPOSE $RAILS_PORT
+# Copy app code
+COPY --from=build --chown=1000:1000 /rails /rails
 
-ENTRYPOINT [ "bundle", "exec" ]
+EXPOSE 3000
+ENTRYPOINT ["/rails/bin/docker-entrypoint"]
+CMD ["./bin/rails", "server", "-b", "0.0.0.0", "-p", "3000"]

Gemfile

@@ -18,24 +18,24 @@ gem 'jbuilder' # Build JSON APIs with ease [https://github.com/rails/jbuilder]
 gem 'jsbundling-rails' # Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]
 gem 'mini_magick', '~> 4.12'
 # Motor Admin allows you to deploy a no-code admin panel for your application in less than a minute
-gem 'motor-admin', '~> 0.4.7'
-gem 'pg', '~> 1.1' # Use postgresql as the database for Active Record
+gem 'motor-admin', '>= 0.4.30'
+gem 'pg', '~> 1.5' # Use postgresql as the database for Active Record
 gem 'premailer-rails', '~> 1.12' # This gem is a drop in solution for styling HTML emails with CSS
 gem 'puma', '~> 6.0' # Use the Puma web server [https://github.com/puma/puma]
-gem 'rails', '~> 7.2.2.1' # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
+gem 'rails', '~> 8.0' # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
 # Pagination
 gem 'pagy', '~> 9.4.0'
 # gem 'kaminari'
 # gem 'kaminari-tailwind'
-gem 'redis', '~> 4.0' # Use Redis adapter to run Action Cable in production
+gem 'redis', '~> 5.0' # Use Redis adapter to run Action Cable in production
 # An ActionMailer adapter to send email using SendGrid's HTTPS Web API (instead of SMTP).
-gem 'rack-attack' # Rack middleware for blocking & throttling abusive requests
+gem 'rack-attack', '>= 6.7' # Rack middleware for blocking & throttling abusive requests (Rack 3 compatible)
 gem 'sendgrid-actionmailer', '~> 3.2'
-gem 'simple_form', '~> 5.1' # Gem to pimp up forms
+gem 'simple_form', '~> 5.3' # Gem to pimp up forms
 gem 'sitemap_generator' # A dynamic sitemap generator gem for the Ruby on Rails framework
-gem 'sprockets-rails' # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
-gem 'stimulus-rails' # Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
-gem 'turbo-rails' # Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
+gem 'sprockets-rails', '>= 3.5' # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
+gem 'stimulus-rails', '>= 1.3' # Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
+gem 'turbo-rails', '>= 2.0' # Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'rails_cloudflare_turnstile'
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
@@ -62,10 +62,8 @@ group :development do
   # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
   # gem "spring"
 
-  gem 'annotate', '~> 3.2', '>= 3.2.0'
-
   # Capistrano - deployment gems
-  gem 'capistrano', '~> 3.11'
+  gem 'capistrano', '~> 3.19'
   gem 'capistrano-asdf'
   gem 'capistrano-passenger', '~> 0.2.0'
   gem 'capistrano-rails', '~> 1.4'