Release 2.10.0

.annotaterb.yml

@@ -0,0 +1,65 @@
+---
+:position: before
+:position_in_additional_file_patterns: before
+:position_in_class: before
+:position_in_factory: before
+:position_in_fixture: before
+:position_in_routes: before
+:position_in_serializer: before
+:position_in_test: before
+:classified_sort: true
+:exclude_controllers: true
+:exclude_factories: true
+:exclude_fixtures: true
+:exclude_helpers: true
+:exclude_scaffolds: true
+:exclude_serializers: true
+:exclude_sti_subclasses: false
+:exclude_tests: true
+:force: false
+:format_markdown: false
+:format_rdoc: false
+:format_yard: false
+:frozen: false
+:grouped_polymorphic: false
+:ignore_model_sub_dir: false
+:ignore_unknown_models: false
+:include_version: false
+:show_check_constraints: false
+:show_complete_foreign_keys: false
+:show_foreign_keys: true
+:show_indexes: true
+:show_indexes_include: false
+:simple_indexes: false
+:sort: false
+:timestamp: false
+:trace: false
+:with_comment: true
+:with_column_comments: true
+:with_table_comments: true
+:position_of_column_comment: :with_name
+:active_admin: false
+:command:
+:debug: false
+:hide_default_column_types: ''
+:hide_limit_column_types: ''
+:timestamp_columns:
+- created_at
+- updated_at
+:ignore_columns:
+:ignore_routes:
+:ignore_multi_database_name: false
+:models: true
+:routes: false
+:skip_on_db_migrate: false
+:target_action: :do_annotations
+:wrapper:
+:wrapper_close: 'rubocop:enable Layout/LineLength, Lint/RedundantCopDisableDirective'
+:wrapper_open: 'rubocop:disable Layout/LineLength, Lint/RedundantCopDisableDirective'
+:classes_default_to_s: []
+:additional_file_patterns: []
+:model_dir:
+- app/models
+:require: []
+:root_dir:
+- ''

.dockerfiles/Dockerfile

@@ -1,38 +1,47 @@
-FROM ubuntu:jammy AS base
+FROM ubuntu:24.04 AS base
 
-ARG NODE_MAJOR=20
-ARG BUNDLER_VERSION='2.4.13'
-ARG RUBY_VERSION='3.3.4'
+ARG NODE_MAJOR=24
+ARG BUNDLER_VERSION='4.0.10'
+ARG RUBY_VERSION='3.4.9'
 ARG USER=markus
 
 # Required in order to ensure bind-mounts are owned by the correct user inside the container
 # this is NOT required when using docker-desktop since that handles uid mappings differently.
 # Set this to the same UID as the user that owns the Markus files on the host machine.
 ARG UID=1001
 
+# Remove ubuntu user, added in the 23.04 image
+RUN userdel -r ubuntu
+
 # Create the user that runs the app
 RUN useradd -m -u $UID -s /bin/bash $USER
 
-# Set up the correct node version for later installation
-ADD https://deb.nodesource.com/setup_$NODE_MAJOR.x /tmp/setup_node.sh
-RUN sh /tmp/setup_node.sh
+# Set up the correct node version AND PostgreSQL repo for later installation
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends wget ca-certificates sudo gnupg lsb-release && \
+    install -m 0755 -d /etc/apt/keyrings && \
+    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/keyrings/postgresql.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+    wget -O /tmp/setup_node.sh https://deb.nodesource.com/setup_$NODE_MAJOR.x && \
+    sh /tmp/setup_node.sh && \
+    rm /tmp/setup_node.sh
 
 # Copy the debian package containing system dependencies
 COPY markus_1.0_all.deb /
 
-# Install basic system dependencies
+# Install basic system dependencies and the specific PG client version
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends /markus_1.0_all.deb && \
-    rm /tmp/setup_node.sh /markus_1.0_all.deb
-
-# Install Ruby (we use ruby-install to configure the installed ruby version).
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends wget ca-certificates sudo && \
-    wget https://github.com/postmodern/ruby-install/releases/download/v0.9.3/ruby-install-0.9.3.tar.gz && \
-    tar -xzvf ruby-install-0.9.3.tar.gz && \
-    cd ruby-install-0.9.3/ && \
-    make install && \
-    ruby-install --update && \
-    ruby-install --system ruby $RUBY_VERSION
+    DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
+    /markus_1.0_all.deb \
+    postgresql-client-17 && \
+    rm /markus_1.0_all.deb
+
+# Install Ruby from precompiled binaries.
+# See https://github.com/jdx/ruby
+RUN ARCH=$(uname -m | sed 's/x86_64/x86_64_linux/;s/aarch64/arm64_linux/') && \
+    wget -O /tmp/ruby.tar.gz https://github.com/jdx/ruby/releases/download/$RUBY_VERSION/ruby-$RUBY_VERSION.$ARCH.tar.gz && \
+    tar --strip-components=1 -C /usr/local -xzf /tmp/ruby.tar.gz && \
+    rm /tmp/ruby.tar.gz
 
 # Enable reading of PDF files with imagemagick
 RUN sed -ri 's/(rights=")none("\s+pattern="PDF")/\1read\2/' /etc/ImageMagick-6/policy.xml
@@ -81,6 +90,7 @@ RUN apt-get update -qq && \
     DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:deadsnakes/ppa && \
     DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends openssh-server \
                                                                                python3.13 \
+                                                                               python3.13-dev \
                                                                                python3.13-venv \
                                                                                equivs \
                                                                                libjemalloc2
@@ -133,7 +143,7 @@ ENV RAILS_ENV=production
 ENV NODE_ENV=production
 
 # Install gems
-RUN SECRET_KEY_BASE=1 bundle install --deployment
+RUN SECRET_KEY_BASE=1 BUNDLE_DEPLOYMENT=1 bundle install
 
 # Precompile assets
 RUN SECRET_KEY_BASE=1 NO_SCHEMA_VALIDATE=true NO_INIT_SCHEDULER=true PGDATABASE=dummy bundle exec rails assets:precompile

.dockerfiles/entrypoint-dev-rails.sh

@@ -20,8 +20,5 @@ sed -i -e :a -e '/^\n*$/{$d;N;};/\n$/ba' /app/db/structure.sql
 
 rm -f ./tmp/pids/server.pid
 
-# cssbundling-rails development command
-npm run build-dev:css &
-
 # Then exec the container's main process (what's set as CMD in the Dockerfile or compose.yaml).
 exec "$@"

.github/dependabot.yml

@@ -1,5 +1,9 @@
 version: 2
 updates:
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: quarterly
 - package-ecosystem: bundler
   directory: "/"
   schedule:

.github/workflows/test_ci.yml

@@ -9,10 +9,10 @@ on:
 jobs:
   test_rspec:
     if: github.event.pull_request.draft == false
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     services:
       postgres:
-        image: postgres:14
+        image: postgres:17
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -42,13 +42,20 @@ jobs:
       contents: read
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+      - name: Add PostgreSQL apt repository
+        run: |
+          sudo apt-get install -y curl ca-certificates
+          sudo install -d /usr/share/postgresql-common/pgdg
+          sudo curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
+          sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
       - name: Install and cache system dependencies
         uses: awalsh128/cache-apt-pkgs-action@latest
         with:
           packages: |
             libpq-dev
             cmake
+            pkg-config
             ghostscript
             pandoc
             imagemagick
@@ -59,7 +66,7 @@ jobs:
             pandoc
             poppler-utils
             fonts-liberation
-            libasound2
+            libasound2t64
             libatk-bridge2.0-0
             libatk1.0-0
             libatspi2.0-0
@@ -83,38 +90,40 @@ jobs:
             libxfixes3
             libxrandr2
             libxshmfence1
-          version: 1.0
+            postgresql-client-17
+          version: 1.0.2
           # Packages 'fonts-liberation' and onward are needed for playwright's chromium installation.
           # The list was taken from: https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/registry/nativeDeps.ts#L37-L63
+          # libasound2 renamed to libasound2t64 in Ubuntu 24.04
       - name: Set up ruby and cache gems
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ruby-3.3
+          ruby-version: ruby-3.4
           bundler-cache: true
       - name: Set up node and cache packages
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 18
+          node-version: 24
           cache: npm
       - name: Install npm packages
         run: npm ci
       - name: Install python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.13"
       - name: Get pip cache dir
         id: pip-cache
         run: |
           echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ hashFiles('requirements-jupyter.txt') }}-${{ hashFiles('requirements-scanner.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Cache playwright's installation of Chromium
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.cache/ms-playwright
           key: ${{ runner.os }}-playwright-${{ hashFiles('requirements-jupyter.txt') }}
@@ -132,9 +141,7 @@ jobs:
           sudo sed -ri 's/(rights=")none("\s+pattern="PDF")/\1read\2/' /etc/ImageMagick-6/policy.xml
           cp config/database.yml.ci config/database.yml
       - name: Build assets
-        run: |
-          bundle exec rake javascript:build
-          bundle exec rake css:build
+        run: bundle exec rake javascript:build
       - name: Set up database
         run: bundle exec rails db:migrate
       - name: Install  chromedriver
@@ -159,7 +166,7 @@ jobs:
 
   test_jest:
     if: github.event.pull_request.draft == false
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     services:
       redis:
         image: redis
@@ -174,15 +181,16 @@ jobs:
     permissions:
       contents: read
     env:
+      BUNDLE_WITHOUT: development:production:console:unicorn
       RAILS_ENV: test
       NODE_ENV: test
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up ruby and cache gems
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ruby-3.3
+          ruby-version: ruby-3.4
           bundler-cache: true
       - name: Configure server
         run: |
@@ -196,9 +204,9 @@ jobs:
         run: |
           bundle exec rake javascript:build
       - name: Set up node and cache packages
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 18
+          node-version: 24
           cache: npm
       - name: Install npm packages
         run: npm ci
@@ -215,7 +223,7 @@ jobs:
   finish:
     needs: [test_rspec, test_jest]
     if: github.event.pull_request.draft == false
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       pull-requests: write
     steps:

.pre-commit-config.yaml

@@ -17,12 +17,12 @@ repos:
         -   id: end-of-file-fixer
         -   id: trailing-whitespace
   -   repo: https://github.com/rbubley/mirrors-prettier
-      rev: v3.7.3
+      rev: v3.8.3
       hooks:
         - id: prettier
           types_or: [javascript, jsx, css, scss, html]
   -   repo: https://github.com/thibaudcolas/pre-commit-stylelint
-      rev: v16.26.1
+      rev: v17.10.0
       hooks:
         - id: stylelint
           additional_dependencies: [
@@ -39,7 +39,7 @@ repos:
               app/assets/stylesheets/common/_reset.scss
             )$
   - repo: https://github.com/rubocop/rubocop
-    rev: v1.81.7
+    rev: v1.86.1
     hooks:
       - id: rubocop
         args: ["--autocorrect"]
@@ -53,11 +53,11 @@ repos:
           )$
         additional_dependencies:
           - rubocop-rails:2.33.4
-          - rubocop-performance:1.23.0
-          - rubocop-factory_bot:2.26.1
+          - rubocop-performance:1.26.1
+          - rubocop-factory_bot:2.28.0
           - rubocop-rspec:3.2.0
-          - rubocop-rspec_rails:2.30.0
-          - rubocop-capybara:2.21.0
+          - rubocop-rspec_rails:2.32.0
+          - rubocop-capybara:2.22.1
   - repo: local
     hooks:
       - id: erb_lint
@@ -73,6 +73,14 @@ repos:
           )$
         additional_dependencies:
           - erb_lint:0.9.0
+      - id: i18n-tasks-health
+        name: i18n-tasks health
+        entry: i18n-tasks health
+        language: ruby
+        files: config/locales/
+        pass_filenames: false
+        additional_dependencies:
+          - i18n-tasks
 
 exclude: vendor