Merge pull request #350 from projekteuler/docker-build

Add Workflow for building and releasing Docker image

.dockerignore

@@ -0,0 +1,39 @@
+# 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 default key files.
+/config/master.key
+/config/credentials/*.key
+
+# Ignore all environment files.
+/.env*
+!/.env.example
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/
+!/tmp/pids/.keep
+
+# Ignore storage (uploaded files in development and any SQLite databases).
+/storage/*
+!/storage/.keep
+/tmp/storage/*
+!/tmp/storage/
+!/tmp/storage/.keep
+
+# Ignore assets.
+/node_modules/
+/app/assets/builds/*
+!/app/assets/builds/.keep
+/public/assets

.gitattributes

@@ -0,0 +1,9 @@
+# See https://git-scm.com/docs/gitattributes for more about git attribute files.
+
+# Mark the database schema as having been generated.
+db/schema.rb linguist-generated
+
+# Mark any vendored files as having been vendored.
+vendor/* linguist-vendored
+config/credentials/*.yml.enc diff=rails_credentials
+config/credentials.yml.enc diff=rails_credentials

.github/workflows/ci.yml

@@ -1,25 +1,25 @@
 name: CI
 on:
   push:
-    branches: [ $default-branch ]
+    branches: [$default-branch]
   pull_request:
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0']
+        ruby: ["3.0", "3.1", "3.2"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Set up Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: "20"
       - name: Install dependencies
         run: bundle install --without production
       - name: Run tests

.github/workflows/release.yml

@@ -0,0 +1,48 @@
+#
+name: Create and publish a Docker image
+
+# Configures this workflow to run every time a change is pushed to the branch called `release`.
+on:
+  push:
+    branches: ["release"]
+
+# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
+    permissions:
+      contents: read
+      packages: write
+      #
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
+      # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
+      # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
+      - name: Build and push Docker image
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -12,13 +12,24 @@
 /db/*.sqlite3-journal
 
 # Ignore all logfiles and tempfiles.
-/log/*.log
+/log/*
-/tmp
+/tmp/*
+!/log/.keep
+!/tmp/.keep
 
-# Ignore coverage data generated by coveralls
+# Ignore pidfiles, but keep the directory.
-/coverage
+/tmp/pids/*
-# Ignore encrypted secrets key file.
+!/tmp/pids/
-config/secrets.yml.key
+!/tmp/pids/.keep
+
+# Ignore storage (uploaded files in development and any SQLite databases).
+/storage/*
+!/storage/.keep
+/tmp/storage/*
+!/tmp/storage/
+!/tmp/storage/.keep
+
+/public/assets
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key

.ruby-version

@@ -0,0 +1 @@
+ruby-3.2.2

Dockerfile

@@ -0,0 +1,77 @@
+# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
+ARG RUBY_VERSION=3.2.2
+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 and node modules
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y build-essential git libvips pkg-config curl node-gyp default-libmysqlclient-dev
+
+# Install JavaScript dependencies
+ARG NODE_VERSION=20.5.0
+ARG YARN_VERSION=1.22.19
+ENV PATH=/usr/local/node/bin:$PATH
+RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
+    /tmp/node-build-master/bin/node-build "${NODE_VERSION}" /usr/local/node && \
+    npm install -g yarn@$YARN_VERSION && \
+    rm -rf /tmp/node-build-master
+
+
+# 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
+
+# Install node modules
+#COPY package.json yarn.lock ./
+#RUN yarn install --frozen-lockfile
+
+# Copy application code
+COPY . .
+
+# Precompile bootsnap code for faster boot times
+RUN bundle exec bootsnap precompile app/ lib/
+
+# 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
+LABEL org.opencontainers.image.source=https://github.com/projekteuler/projekteuler
+LABEL org.opencontainers.image.description="Projekteuler production image"
+LABEL org.opencontainers.image.licenses=MIT
+
+# Install packages needed for deployment
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y curl node-gyp default-mysql-client 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 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

@@ -2,13 +2,13 @@ source 'https://rubygems.org'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '6.1.4'
+gem 'rails', '~> 7.0.6'
 # Use Puma as the app server
-gem 'puma', '~> 5.4'
+gem 'puma', '~> 6.3'
 # Use sqlite3 as the database for Active Record
-gem 'sqlite3', '~> 1.4.1'
+gem 'sqlite3', '~> 1.6.3'
 
-gem 'mysql2', '~> 0.5.2', group: :production
+gem 'mysql2', '~> 0.5.5', group: :production
 
 gem 'bootsnap', require: false
 
@@ -21,33 +21,33 @@ gem 'coffee-rails', '~> 5.0.0'
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer',  platforms: :ruby
 
-gem 'rails-i18n', '~> 6.0.0'
+gem 'rails-i18n', '~> 7.0.7'
 
 gem 'rails-controller-testing'
 
 gem 'webmock', group: :test
 
 # Use jquery as the JavaScript library
-gem 'jquery-rails', '~> 4.4.0'
+gem 'jquery-rails', '~> 4.5.1'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks', '~> 5.2.1'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.11.2'
+gem 'jbuilder', '~> 2.11.3'
 # bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 2.2.0',          group: :doc
+gem 'sdoc', '~> 2.6.1',          group: :doc
 
-gem 'web-console', '~> 4.1.0', group: :development
+gem 'web-console', '~> 4.2.0', group: :development
-gem 'listen', '~> 3.6.0', group: :development
+gem 'listen', '~> 3.8.0', group: :development
 
-gem 'bootstrap', '~> 5.0.1'
+gem 'bootstrap', '~> 5.2.3'
-gem "bootstrap_form", "~> 4.5"
+gem "bootstrap_form", "~> 5.2"
-gem 'font-awesome-sass', '~> 5.15.1'
+gem 'font-awesome-sass', '~> 6.4.0'
 
 # Use Diffy for showing translation diffs
 gem 'diffy'
 gem 'diff-lcs'
 
-gem 'will_paginate', '~> 3.3.0'
+gem 'will_paginate', '~> 3.3.1'
 gem 'will_paginate-bootstrap4', '~> 0.2.2'
 
 gem 'devise', '~> 4.8.0'

Gemfile.lock

@@ -1,80 +1,86 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4)
+    actioncable (7.0.6)
-      actionpack (= 6.1.4)
+      actionpack (= 7.0.6)
-      activesupport (= 6.1.4)
+      activesupport (= 7.0.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4)
+    actionmailbox (7.0.6)
-      actionpack (= 6.1.4)
+      actionpack (= 7.0.6)
-      activejob (= 6.1.4)
+      activejob (= 7.0.6)
-      activerecord (= 6.1.4)
+      activerecord (= 7.0.6)
-      activestorage (= 6.1.4)
+      activestorage (= 7.0.6)
-      activesupport (= 6.1.4)
+      activesupport (= 7.0.6)
       mail (>= 2.7.1)
-    actionmailer (6.1.4)
+      net-imap
-      actionpack (= 6.1.4)
+      net-pop
-      actionview (= 6.1.4)
+      net-smtp
-      activejob (= 6.1.4)
+    actionmailer (7.0.6)
-      activesupport (= 6.1.4)
+      actionpack (= 7.0.6)
+      actionview (= 7.0.6)
+      activejob (= 7.0.6)
+      activesupport (= 7.0.6)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4)
+    actionpack (7.0.6)
-      actionview (= 6.1.4)
+      actionview (= 7.0.6)
-      activesupport (= 6.1.4)
+      activesupport (= 7.0.6)
-      rack (~> 2.0, >= 2.0.9)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4)
+    actiontext (7.0.6)
-      actionpack (= 6.1.4)
+      actionpack (= 7.0.6)
-      activerecord (= 6.1.4)
+      activerecord (= 7.0.6)
-      activestorage (= 6.1.4)
+      activestorage (= 7.0.6)
-      activesupport (= 6.1.4)
+      activesupport (= 7.0.6)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4)
+    actionview (7.0.6)
-      activesupport (= 6.1.4)
+      activesupport (= 7.0.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4)
+    activejob (7.0.6)
-      activesupport (= 6.1.4)
+      activesupport (= 7.0.6)
       globalid (>= 0.3.6)
-    activemodel (6.1.4)
+    activemodel (7.0.6)
-      activesupport (= 6.1.4)
+      activesupport (= 7.0.6)
-    activerecord (6.1.4)
+    activerecord (7.0.6)
-      activemodel (= 6.1.4)
+      activemodel (= 7.0.6)
-      activesupport (= 6.1.4)
+      activesupport (= 7.0.6)
-    activestorage (6.1.4)
+    activestorage (7.0.6)
-      actionpack (= 6.1.4)
+      actionpack (= 7.0.6)
-      activejob (= 6.1.4)
+      activejob (= 7.0.6)
-      activerecord (= 6.1.4)
+      activerecord (= 7.0.6)
-      activesupport (= 6.1.4)
+      activesupport (= 7.0.6)
-      marcel (~> 1.0.0)
+      marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+    addressable (2.8.4)
-    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 6.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    autoprefixer-rails (10.4.13.0)
-    autoprefixer-rails (10.2.5.0)
+      execjs (~> 2)
-      execjs (< 2.8.0)
     bcrypt (3.1.16)
     bindex (0.8.1)
-    bootsnap (1.7.7)
+    bootsnap (1.16.0)
-      msgpack (~> 1.0)
+      msgpack (~> 1.2)
-    bootstrap (5.0.1)
+    bootstrap (5.2.3)
       autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 2.9.2, < 3)
+      popper_js (>= 2.11.6, < 3)
       sassc-rails (>= 2.0.0)
-    bootstrap_form (4.5.0)
+    bootstrap_form (5.2.3)
-      actionpack (>= 5.2)
+      actionpack (>= 6.0)
-      activemodel (>= 5.2)
+      activemodel (>= 6.0)
     builder (3.2.4)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
@@ -83,140 +89,153 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    devise (4.8.0)
+    date (3.3.3)
+    devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
-    diffy (3.4.0)
+    diffy (3.4.2)
-    erubi (1.10.0)
+    erubi (1.12.0)
-    execjs (2.7.0)
+    execjs (2.8.1)
-    faraday (1.4.1)
+    faraday (2.7.4)
-      faraday-excon (~> 1.1)
+      faraday-net_http (>= 2.0, < 3.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
-    faraday-excon (1.1.0)
+    faraday-net_http (3.0.2)
-    faraday-net_http (1.0.1)
+    ffi (1.15.5)
-    faraday-net_http_persistent (1.1.0)
+    font-awesome-sass (6.4.0)
-    ffi (1.15.3)
+      sassc (~> 2.0)
-    font-awesome-sass (5.15.1)
+    globalid (1.1.0)
-      sassc (>= 1.11)
+      activesupport (>= 5.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
     hashdiff (1.0.1)
-    hashie (4.1.0)
+    hashie (5.0.0)
-    i18n (1.8.10)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.11.2)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    jquery-rails (4.4.0)
+    jquery-rails (4.5.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jwt (2.2.3)
+    jwt (2.7.0)
-    listen (3.6.0)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.10.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.1.0)
+    mini_mime (1.1.2)
-    mini_portile2 (2.5.3)
+    mini_portile2 (2.8.2)
-    minitest (5.14.4)
+    minitest (5.18.1)
-    msgpack (1.4.2)
+    msgpack (1.6.0)
-    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    mysql2 (0.5.5)
-    mysql2 (0.5.3)
+    net-imap (0.3.6)
-    nio4r (2.5.7)
+      date
-    nokogiri (1.11.7)
+      net-protocol
-      mini_portile2 (~> 2.5.0)
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.15.3)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oauth2 (1.4.7)
+    oauth2 (2.0.9)
-      faraday (>= 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
-    omniauth (2.0.4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    omniauth (2.1.1)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
       rack-protection
-    omniauth-github (2.0.0)
+    omniauth-github (2.0.1)
       omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.7.1)
+      omniauth-oauth2 (~> 1.8)
-    omniauth-oauth2 (1.7.1)
+    omniauth-oauth2 (1.8.0)
-      oauth2 (~> 1.4)
+      oauth2 (>= 1.4, < 3)
-      omniauth (>= 1.9, < 3)
+      omniauth (~> 2.0)
-    omniauth-rails_csrf_protection (1.0.0)
+    omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     orm_adapter (0.5.0)
-    popper_js (2.9.2)
+    popper_js (2.11.7)
-    public_suffix (4.0.6)
+    psych (5.1.0)
-    puma (5.4.0)
+      stringio
+    public_suffix (5.0.1)
+    puma (6.3.0)
       nio4r (~> 2.0)
-    racc (1.5.2)
+    racc (1.7.1)
-    rack (2.2.3)
+    rack (2.2.7)
-    rack-protection (2.1.0)
+    rack-protection (3.0.6)
       rack
-    rack-test (1.1.0)
+    rack-test (2.1.0)
-      rack (>= 1.0, < 3)
+      rack (>= 1.3)
-    rails (6.1.4)
+    rails (7.0.6)
-      actioncable (= 6.1.4)
+      actioncable (= 7.0.6)
-      actionmailbox (= 6.1.4)
+      actionmailbox (= 7.0.6)
-      actionmailer (= 6.1.4)
+      actionmailer (= 7.0.6)
-      actionpack (= 6.1.4)
+      actionpack (= 7.0.6)
-      actiontext (= 6.1.4)
+      actiontext (= 7.0.6)
-      actionview (= 6.1.4)
+      actionview (= 7.0.6)
-      activejob (= 6.1.4)
+      activejob (= 7.0.6)
-      activemodel (= 6.1.4)
+      activemodel (= 7.0.6)
-      activerecord (= 6.1.4)
+      activerecord (= 7.0.6)
-      activestorage (= 6.1.4)
+      activestorage (= 7.0.6)
-      activesupport (= 6.1.4)
+      activesupport (= 7.0.6)
       bundler (>= 1.15.0)
-      railties (= 6.1.4)
+      railties (= 7.0.6)
-      sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
+    rails-dom-testing (2.1.1)
-      activesupport (>= 4.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.3)
+      loofah (~> 2.21)
-    rails-i18n (6.0.0)
+      nokogiri (~> 1.14)
+    rails-i18n (7.0.7)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 7)
+      railties (>= 6.0.0, < 8)
-    railties (6.1.4)
+    railties (7.0.6)
-      actionpack (= 6.1.4)
+      actionpack (= 7.0.6)
-      activesupport (= 6.1.4)
+      activesupport (= 7.0.6)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.3.1)
+    rdoc (6.5.0)
+      psych (>= 4.0.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -225,77 +244,84 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sdoc (2.2.0)
+    sdoc (2.6.1)
       rdoc (>= 5.0)
-    sprockets (4.0.2)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.2.2)
+    sprockets-rails (3.4.2)
-      actionpack (>= 4.0)
+      actionpack (>= 5.2)
-      activesupport (>= 4.0)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
+    sqlite3 (1.6.3)
-    thor (1.1.0)
+      mini_portile2 (~> 2.8.0)
-    tilt (2.0.10)
+    stringio (3.0.6)
+    thor (1.2.2)
+    tilt (2.1.0)
+    timeout (0.4.0)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
+    version_gem (1.1.2)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.1.0)
+    web-console (4.2.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.13.0)
+    webmock (3.18.1)
-      addressable (>= 2.3.6)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.3.0)
+    will_paginate (3.3.1)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bootsnap
-  bootstrap (~> 5.0.1)
+  bootstrap (~> 5.2.3)
-  bootstrap_form (~> 4.5)
+  bootstrap_form (~> 5.2)
   coffee-rails (~> 5.0.0)
   devise (~> 4.8.0)
   diff-lcs
   diffy
-  font-awesome-sass (~> 5.15.1)
+  font-awesome-sass (~> 6.4.0)
-  jbuilder (~> 2.11.2)
+  jbuilder (~> 2.11.3)
-  jquery-rails (~> 4.4.0)
+  jquery-rails (~> 4.5.1)
-  listen (~> 3.6.0)
+  listen (~> 3.8.0)
-  mysql2 (~> 0.5.2)
+  mysql2 (~> 0.5.5)
   omniauth
   omniauth-github
   omniauth-rails_csrf_protection
-  puma (~> 5.4)
+  puma (~> 6.3)
-  rails (= 6.1.4)
+  rails (~> 7.0.6)
   rails-controller-testing
-  rails-i18n (~> 6.0.0)
+  rails-i18n (~> 7.0.7)
   sassc-rails (~> 2.1.2)
-  sdoc (~> 2.2.0)
+  sdoc (~> 2.6.1)
-  sqlite3 (~> 1.4.1)
+  sqlite3 (~> 1.6.3)
   turbolinks (~> 5.2.1)
   tzinfo-data
   uglifier (~> 4.2.0)
-  web-console (~> 4.1.0)
+  web-console (~> 4.2.0)
   webmock
-  will_paginate (~> 3.3.0)
+  will_paginate (~> 3.3.1)
   will_paginate-bootstrap4 (~> 0.2.2)
 
 BUNDLED WITH
-   2.2.17
+   2.4.10

README.md

@@ -1,5 +1,4 @@
-Projekt Euler
+# Projekt Euler
-=============
 
 ![Build Status](https://github.com/projekteuler/projekteuler/workflows/CI/badge.svg)
 
@@ -7,30 +6,31 @@ This is the Ruby on Rails web-app powering [projekteuler.de](https://projekteule
 It allows visitors to view and suggest German translations of the maths puzzles found on [projecteuler.net](https://projecteuler.net).
 
 ## Getting started
-1. Download this repository, e.g., with `git clone`.
+
-2. Make sure [NodeJS](https://nodejs.org) is installed.
+1.  Download this repository, e.g., with `git clone`.
-3. Navigate inside the repository folder.
+2.  Make sure [NodeJS >= 18](https://nodejs.org) is installed.
-4. Use bundler to install all required gems.
+3.  Navigate inside the repository folder.
-        
+4.  Use bundler to install all required gems.
-        $ bundle install
+    $ bundle install
-        
+5.  Setup the database:
-5. Setup the database:
 
         $ bin/rails db:setup
-        
+
-6. Start the server:
+6.  Start the server:
 
         $ bin/rails server
-        
+
-7. Open `http://localhost:3000` in your browser. You should see the web app up and running!
+7.  Open `http://localhost:3000` in your browser. You should see the web app up and running!
-8. Start playing with the web app. By default, the database will contain some users and translations. The user `admin` can review translations, while the user `translator` has submitted some translations.
+8.  Start playing with the web app. By default, the database will contain some users and translations. The user `admin` can review translations, while the user `translator` has submitted some translations.
-You can login as any user by clicking the Login button and entering their name. This is simply a mock OAuth login; in production mode, GitHub is used for login.
+    You can login as any user by clicking the Login button and entering their name. This is simply a mock OAuth login; in production mode, GitHub is used for login.
-9. If you ever want to reset the database to the original state, run `rails db:reset`.
+9.  If you ever want to reset the database to the original state, run `rails db:reset`.
 
 ## Contributing
+
 Do you have a suggestion for an improvement for the web app? Please create an [issue](https://github.com/projekteuler/projekteuler/issues) for it.
 
 Do you want to implement this improvement yourself? Follow these steps:
+
 1. Fork this repository on GitHub.
 2. Create a new branch for your improvement
 3. Implement your improvement, and create tests for it if applicable.
@@ -43,12 +43,14 @@ Do you want to implement this improvement yourself? Follow these steps:
 3. Copy all files from this repository.
 4. Make sure the Rails environment is set to `production`.
 5. Set up the following environment variables:
-    * `RAILS_MASTER_KEY`: The master key for decryption of the Rails credentials
+   - `RAILS_MASTER_KEY`: The master key for decryption of the Rails credentials
-    * `DATABASE_NAME`: The name of the MySQL database
+   - `DATABASE_NAME`: The name of the MySQL database
-    * `DATABASE_USERNAME`: The username for the MYSQL database
+   - `DATABASE_USERNAME`: The username for the MYSQL database
-    * `DATABASE_PASSWORD`: The password for the MYSQL database
+   - `DATABASE_PASSWORD`: The password for the MYSQL database
-    * `GITHUB_CLIENT_ID`:  The client ID of your GitHub OAuth App (that you will need to create)
+   - `DATABASE_HOST`: The host of the MYSQL database
-    * `GITHUB_CLIENT_SECRET`:  The client secret of the GitHub OAuth App
+   - `DATABASE_PORT`: The port of the MYSQL database
+   - `GITHUB_CLIENT_ID`: The client ID of your GitHub OAuth App (that you will need to create)
+   - `GITHUB_CLIENT_SECRET`: The client secret of the GitHub OAuth App
 6. Install all required gems with `bundle install`.
 7. Load the database schema with `bin/rails db:schema:load`.
 8. Precompile all assets with `bin/rails assets:precompile`.
@@ -57,4 +59,5 @@ Do you want to implement this improvement yourself? Follow these steps:
 Anytime you update the files, you should run `bin/rails db:migrate`, `bin/rails log:clear tmp:clear`, `bin/rails assets:precompile` and then restart the server.
 
 ## License
+
 This project is released under the [MIT License](https://opensource.org/licenses/MIT).

app/assets/stylesheets/application.css.scss

@@ -17,7 +17,6 @@
 
 @import "bootstrap";
 @import "rails_bootstrap_forms";
-@import "font-awesome-sprockets";
 @import "font-awesome";
 
 .turbolinks-progress-bar {

bin/docker-entrypoint

@@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+# If running the rails server then create or migrate existing database
+if [ "${*}" == "./bin/rails server" ]; then
+  ./bin/rails db:prepare
+fi
+
+exec "${@}"

bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../config/application', __dir__)
+APP_PATH = File.expand_path("../config/application", __dir__)
 require_relative "../config/boot"
 require "rails/commands"

bin/setup

@@ -2,7 +2,7 @@
 require "fileutils"
 
 # path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
+APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -13,24 +13,21 @@ FileUtils.chdir APP_ROOT do
   # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies =='
+  puts "== Installing dependencies =="
-  system! 'gem install bundler --conservative'
+  system! "gem install bundler --conservative"
-  system('bundle check') || system!('bundle install')
+  system("bundle check") || system!("bundle install")
-
-  # Install JavaScript dependencies
-  # system! 'bin/yarn'
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
+  # unless File.exist?("config/database.yml")
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:prepare'
+  system! "bin/rails db:prepare"
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! "bin/rails restart"
 end

config/application.rb

@@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
 module Projekteuler
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.1
+    config.load_defaults 7.0
 
     # Configuration for the application, engines, and railties goes here.
     #
@@ -27,7 +27,8 @@ module Projekteuler
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    config.time_zone = 'Berlin'
+    config.time_zone = "Berlin"
+    # config.eager_load_paths << Rails.root.join("extras")
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}').to_s]

config/boot.rb

@@ -1,4 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
 require "bundler/setup" # Set up gems listed in the Gemfile.
 require "bootsnap/setup" # Speed up boot time by caching expensive operations.

config/database.yml

@@ -27,5 +27,5 @@ production:
   database: <%= ENV['DATABASE_NAME'] %>
   username: <%= ENV['DATABASE_USERNAME'] %>
   password: <%= ENV['DATABASE_PASSWORD'] %>
-  host: 127.0.0.1
+  host: <%= ENV['DATABASE_HOST'] %>
-  port: 3306
+  port: <%= ENV['DATABASE_PORT'] %>

config/environment.rb

@@ -1,5 +1,19 @@
 # Load the Rails application.
 require_relative "application"
 
+# Replace when upgrading to Rails 7.1
+# See https://github.com/rails/rails/issues/32947#issuecomment-1356391185
+class Rails::Application
+  def secret_key_base
+    if Rails.env.development? || Rails.env.test? || ENV["SECRET_KEY_BASE_DUMMY"]
+      secrets.secret_key_base ||= generate_development_secret
+    else
+      validate_secret_key_base(
+        ENV["SECRET_KEY_BASE"] || credentials.secret_key_base || secrets.secret_key_base
+      )
+    end
+  end
+end
+
 # Initialize the Rails application.
 Rails.application.initialize!

config/environments/development.rb

@@ -14,15 +14,18 @@ Rails.application.configure do
   # Show full error reports.
   config.consider_all_requests_local = true
 
+  # Enable server timing
+  config.server_timing = true
+
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+  if Rails.root.join("tmp/caching-dev.txt").exist?
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+      "Cache-Control" => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false
@@ -53,11 +56,6 @@ Rails.application.configure do
   # Highlight code that triggered database queries in logs.
   config.active_record.verbose_query_logs = true
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
-
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
@@ -67,10 +65,6 @@ Rails.application.configure do
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
 
-  # Use an evented file watcher to asynchronously detect changes in source code,
-  # routes, locales, etc. This feature depends on the listen gem.
-  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
-
   # Uncomment if you wish to allow Action Cable access from any origin.
   # config.action_cable.disable_request_forgery_protection = true
 end

config/environments/production.rb

@@ -18,15 +18,12 @@ Rails.application.configure do
 
   # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
   # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
-  config.require_master_key = true
+  config.require_master_key = false
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
 
-  # Compress JS using a preprocessor.
-  config.assets.js_compressor = Uglifier.new(harmony: true)
-  
   # Compress CSS using a preprocessor.
   # config.assets.css_compressor = :sass
 
@@ -34,19 +31,19 @@ Rails.application.configure do
   config.assets.compile = false
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.asset_host = 'http://assets.example.com'
+  # config.asset_host = "http://assets.example.com"
 
   # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+  # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
 
   # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
 
   # Mount Action Cable outside main process or domain.
   # config.action_cable.mount_path = nil
-  # config.action_cable.url = 'wss://example.com/cable'
+  # config.action_cable.url = "wss://example.com/cable"
-  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+  # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ]
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   config.force_ssl = true
@@ -75,21 +72,15 @@ Rails.application.configure do
   # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners.
+  # Log deprecations.
-  config.active_support.deprecation = :notify
+  config.active_support.report_deprecations = true
-
-  # Log disallowed deprecations.
-  config.active_support.disallowed_deprecation = :log
-
-  # Tell Active Support which deprecation messages to disallow.
-  config.active_support.disallowed_deprecation_warnings = []
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
   # Use a different logger for distributed setups.
   # require "syslog/logger"
-  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
 
   if ENV["RAILS_LOG_TO_STDOUT"].present?
     logger           = ActiveSupport::Logger.new(STDOUT)
@@ -99,25 +90,4 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
-
-  # Inserts middleware to perform automatic connection switching.
-  # The `database_selector` hash is used to pass options to the DatabaseSelector
-  # middleware. The `delay` is used to determine how long to wait after a write
-  # to send a subsequent read to the primary.
-  #
-  # The `database_resolver` class is used by the middleware to determine which
-  # database is appropriate to use based on the time delay.
-  #
-  # The `database_resolver_context` class is used by the middleware to set
-  # timestamps for the last write to the primary. The resolver uses the context
-  # class timestamps to determine how long to wait before reading from the
-  # replica.
-  #
-  # By default Rails will store a last write timestamp in the session. The
-  # DatabaseSelector middleware is designed as such you can define your own
-  # strategy for connection switching and pass that into the middleware through
-  # these configuration options.
-  # config.active_record.database_selector = { delay: 2.seconds }
-  # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
-  # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
 end

config/environments/test.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
 # The test environment is used exclusively to run your application's
 # test suite. You never need to work with it otherwise. Remember that
 # your test database is "scratch space" for the test suite and is wiped
@@ -6,17 +8,18 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
+  # Turn false under Spring and add config.action_view.cache_template_loading = true.
   config.cache_classes = true
 
-  # Do not eager load code on boot. This avoids loading your whole application
+  # Eager loading loads your whole application. When running a single test locally,
-  # just for the purpose of running a single test. If you are using a tool that
+  # this probably isn't necessary. It's a good idea to do in a continuous integration
-  # preloads Rails for running tests, you may have to set it to true.
+  # system, or in some way before deploying your code.
-  config.eager_load = false
+  config.eager_load = ENV["CI"].present?
 
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+    "Cache-Control" => "public, max-age=#{1.hour.to_i}"
   }
 
   # Show full error reports and disable caching.

config/initializers/assets.rb

@@ -1,12 +1,10 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+Rails.application.config.assets.version = "1.0"
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
-# Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join('node_modules')
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets

config/initializers/content_security_policy.rb

@@ -4,26 +4,24 @@
 # For further information see the following documentation
 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
 
-Rails.application.config.content_security_policy do |policy|
+Rails.application.configure do
-  policy.default_src :none
+  config.content_security_policy do |policy|
-  policy.font_src    :self, 'https://cdnjs.cloudflare.com'
+    policy.default_src :none
-  policy.img_src     :self, 'https://cdnjs.cloudflare.com', 'https://projecteuler.net'
+    policy.font_src    :self, "https://cdnjs.cloudflare.com"
-  policy.object_src  :none
+    policy.img_src     :self, "https://cdnjs.cloudflare.com", "https://projecteuler.net"
-  policy.script_src  :self, 'https://cdnjs.cloudflare.com'
+    policy.object_src  :none
-  policy.style_src   :self, :unsafe_inline
+    policy.script_src  :self, "https://cdnjs.cloudflare.com"
-  policy.connect_src :self
+    policy.style_src   :self, :unsafe_inline
+    policy.connect_src :self
+    # Specify URI for violation reports
+    # policy.report_uri "/csp-violation-report-endpoint"
+  end
 
-  # Specify URI for violation reports
+  # Generate session nonces for permitted importmap and inline scripts
-  # policy.report_uri "/csp-violation-report-endpoint"
+  config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+  config.content_security_policy_nonce_directives = %w(script-src)
+
+  # Report CSP violations to a specified URI. See:
+  # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
+  # config.content_security_policy_report_only = true
 end
-
-# If you are using UJS then enable automatic nonce generation
-# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
-
-# Set the nonce only to specific directives
-# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
-
-# Report CSP violations to a specified URI
-# For further information see the following documentation:
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
-# Rails.application.config.content_security_policy_report_only = true

config/initializers/inflections.rb

@@ -4,13 +4,13 @@
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.plural /^(ox)$/i, "\\1en"
-#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.singular /^(ox)en/i, "\\1"
-#   inflect.irregular 'person', 'people'
+#   inflect.irregular "person", "people"
 #   inflect.uncountable %w( fish sheep )
 # end
 
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym 'RESTful'
+#   inflect.acronym "RESTful"
 # end