WIP: Rails 7.1 upgrade

.dockerignore

@@ -1,10 +1,42 @@
-.git
-.gitignore
-.bundle
-.gems
-.rbenv-gemsets
-db/*.sqlite3
-log/*
-tmp/*
-vendor/bundle
+# See https://docs.docker.com/engine/reference/builder/#dockerignore-file for more about ignoring files.
+
+# Ignore git directory.
+/.git/
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all environment files (except templates).
+/.env*
+!/.env*.erb
+
+# Ignore all default key files.
+/config/master.key
+/config/credentials/*.key
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/.keep
+
+# Ignore storage (uploaded files in development and any SQLite databases).
+/storage/*
+!/storage/.keep
+/tmp/storage/*
+!/tmp/storage/.keep
+
+# Ignore assets.
+/node_modules/
+/app/assets/builds/*
+!/app/assets/builds/.keep
+/public/assets
+
+# coverage
 /coverage
+
+/db/files/.~*

.gitignore

@@ -38,6 +38,7 @@ spec/.DS_Store
 /dev.env
 
 # Ignore the default SQLite database.
+# TODO: remove
 /db/*.sqlite3
 /db/*.sqlite3-journal
 
@@ -52,6 +53,13 @@ erd.png
 /db/dumps/*
 !/db/dumps/.keep
 
+# Ignore storage (uploaded files in development and any SQLite databases).
+/storage/*
+!/storage/.keep
+/tmp/storage/*
+!/tmp/storage/
+!/tmp/storage/.keep
+
 # Ignore IDE files
 .idea
 .dir-locals.el
@@ -63,3 +71,6 @@ erd.png
 /spec/support/uploads
 
 node_modules
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key

.rubocop.yml

@@ -15,6 +15,7 @@ AllCops:
     - 'db/schema.rb'
     - 'tmp/**/*'
     - 'bin/**/*'
+    - 'config/initializers/new_framework_defaults_*'
 
 Rails/UnknownEnv:
   Environments:

Dockerfile

@@ -1,39 +1,62 @@
-FROM ruby:2.4-alpine
-MAINTAINER Sebastian Schkudlara "[email protected]"
-
-ENV BUILD_PACKAGES bash curl-dev \
-                        build-base \
-                        git \
-                        libxml2-dev \
-                        libxslt-dev \
-                        postgresql-dev \
-                        nodejs \
-                        imagemagick-dev \
-                        xvfb \
-                        qt5-qtwebkit-dev
-
-# Update and install all of the required packages.
-# At the end, remove the apk cache
-RUN apk update && \
-    apk upgrade && \
-    apk add $BUILD_PACKAGES && \
-    rm -rf /var/cache/apk/*
-
-RUN gem install bundler --no-ri --no-rdoc
-RUN QMAKE=/usr/lib/qt5/bin/qmake gem install capybara-webkit --no-ri --no-rdoc
-
-# Use libxml2, libxslt a packages from alpine for building nokogiri
-RUN bundle config build.nokogiri
-
-RUN mkdir /fti_api
-
-WORKDIR /fti_api
-COPY Gemfile Gemfile
-COPY Gemfile.lock Gemfile.lock
-RUN bundle install --jobs 20 --retry 5
-
-ADD . /fti_api
+# syntax = docker/dockerfile:1
 
-EXPOSE 3000
+# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
+ARG RUBY_VERSION=your-ruby-version
+FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
+
+# Rails app lives here
+WORKDIR /rails
+
+# Set production environment
+ENV RAILS_ENV="production" \
+    BUNDLE_DEPLOYMENT="1" \
+    BUNDLE_PATH="/usr/local/bundle" \
+    BUNDLE_WITHOUT="development"
+
+
+# Throw-away build stage to reduce size of final image
+FROM base as build
+
+# Install packages needed to build gems
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y build-essential git libvips pkg-config
+
+# Install application gems
+COPY Gemfile Gemfile.lock ./
+RUN bundle install && \
+    rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git && \
+    bundle exec bootsnap precompile --gemfile
+
+# Copy application code
+COPY . .
+
+# Precompile bootsnap code for faster boot times
+RUN bundle exec bootsnap precompile app/ lib/
 
-ENTRYPOINT ["./entrypoint.sh"]
+# Precompiling assets for production without requiring secret RAILS_MASTER_KEY
+RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
+
+
+# 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 libsqlite3-0 libvips && \
+    rm -rf /var/lib/apt/lists /var/cache/apt/archives
+
+# Copy built artifacts: gems, application
+COPY --from=build /usr/local/bundle /usr/local/bundle
+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 && \
+    chown -R rails:rails db log storage tmp
+USER rails:rails
+
+# Entrypoint prepares the database.
+ENTRYPOINT ["/rails/bin/docker-entrypoint"]
+
+# Start the server by default, this can be overwritten at runtime
+EXPOSE 3000
+CMD ["./bin/rails", "server"]

Gemfile

@@ -42,7 +42,7 @@ gem "paranoia"
 # Rails and DB
 gem "activerecord-postgis-adapter"
 gem "pg"
-gem "rails", "~> 7.0.4"
+gem "rails", "~> 7.1.3"
 gem "rgeo"
 gem "rgeo-geojson"