[wip] upgrade Hyrax, add Valkyrie-based Resources for works

.github/workflows/lint-and-test.yml

@@ -19,10 +19,16 @@ jobs:
         run: bundle exec rubocop --format github
 
   test:
-    name: Test
+    name: "Test (Valkyrie enabled: ${{ github.matrix.hyrax_valkyrie_enabled }})"
     runs-on: ubuntu-latest
-    container: ruby:2.7.8-slim-bullseye
+    container:
+      image: ruby:3.2.9-slim-bookworm
+      volumes:
+        - solr:/tmp/solr
     needs: lint
+    strategy:
+      matrix:
+        hyrax_valkyrie_enabled: [false]
     services:
       database:
         image: postgres:13-alpine
@@ -47,55 +53,51 @@ jobs:
         image: redis:6.2-alpine
         ports:
           - 6379:6379
-      zookeeper:
-        image: bitnami/zookeeper:3.9
-        ports:
-          - 2181:2181
-        env:
-          ZOO_SERVER_ID: 1
-          ALLOW_ANONYMOUS_LOGIN: yes
-          ZOO_SERVERS: zookeeper:2888:3888
-          ZOO_4LW_COMMANDS_WHITELIST: srvr,mntr,conf,ruok
       solr:
-        image: bitnami/solr:8.11.2
+        image: solr:8.11.4
         ports:
           - 8983:8983
-        env:
-          SOLR_ADMIN_USERNAME: solr_admin
-          SOLR_ADMIN_PASSWORD: solr_password
-          SOLR_CLOUD_BOOTSTRAP: yes
-          SOLR_ENABLE_AUTHENTICATION: yes
-          SOLR_ENABLE_CLOUD_MODE: yes
-          SOLR_HOST: solr
-          SOLR_ZK_HOSTS: zookeeper:2181
+        volumes:
+          - solr:/var/solr/data
     env:
       BUNDLE_PATH: vendor/bundle
       BUNDLE_WITH: test
       CAS_BASE_URL: ''
       CI: 1
       FEDORA_TEST_URL: http://fedora:8080/rest
+      HYRAX_VALKYRIE: ${{ matrix.hyrax_valkyrie_enabled }}
       IIIF_BASE_URL: http://localhost/iiif/2
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
       PSQL_PASSWORD: spot_test_pw
       PSQL_USER: spot_test_user
       PSQL_DATABASE: spot_test
       PSQL_HOST: database
       RAILS_ENV: test
-      SOLR_TEST_URL: http://solr_admin:solr_password@solr:8983/solr/spot-test
+      SOLR_TEST_URL: http://solr:8983/solr/spot-test
+      SOLR_VERSION: "8.11.4"
       URL_HOST: http://localhost:3000
 
     steps:
+      - uses: actions/checkout@v4
+      - name: Copy Solr config to mount
+        run: |
+          mkdir -p /tmp/solr/spot-test/data
+          cp -r docker/solr/config/* /tmp/solr/spot-test
+          touch /tmp/solr/spot-test/core.properties
+          chown -R 8983:8983 /tmp/solr/spot-test
+      - name: Restart Solr service
+        uses: docker://docker
+        with:
+          args: docker restart ${{ job.services.solr.id }}
       -
         name: Install system dependencies from Dockerfile
         run: |
-          apt-get update -y && apt-get install -y --no-install-recommends ca-certificates curl gnupg && \
-          mkdir -p /etc/apt/keyrings && \
-          curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
-          echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
-          apt-get update -y && apt-get install -y \
-            build-essential coreutils curl git libxml2 libxml2-dev libxslt-dev \
-            netcat-openbsd nodejs openssl postgresql-13 ruby-dev tzdata zip \
-            libasound2 libdbus-glib-1-dev libgtk-3-0 libpq-dev unzip libx11-xcb1
+          apt-get update -y && apt-get install -y curl && \
+          curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+          apt-get update -y --fix-missing && apt-get install -y --no-install-recommends \
+            awscli build-essential coreutils cron git libjemalloc2 libpq-dev libxml2 \
+            libxml2-dev libxslt-dev netcat-openbsd nodejs openssl postgresql ruby-dev \
+            tzdata zip libasound2 libdbus-glib-1-dev libgtk-3-0 libpq-dev unzip libx11-xcb1
       -
         name: Setup Firefox
         uses: browser-actions/setup-firefox@v1
@@ -113,27 +115,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           geckodriver-version: latest
-      -
-        name: Checkout code
-        uses: actions/checkout@v4
-      -
-        name: Restore Solr config.zip from cache
-        id: solr-config-cache
-        uses: actions/cache@v4
-        with:
-          path: /tmp/spot_solr_config.zip
-          key: spot-solr-${{ hashFiles('docker/solr/config') }}
-      -
-        name: Build Solr config.zip
-        if: steps.solr-config-cache.outputs.cache-hit != 'true'
-        run: |
-          cd docker/solr/config
-          zip -1 /tmp/spot_solr_config.zip ./*
-      -
-        name: Setup Solr core with local configs
-        run: |
-          curl --user solr_admin:solr_password -H "Content-type: application/octet-stream" --data-binary @/tmp/spot_solr_config.zip "http://solr:8983/solr/admin/configs?action=UPLOAD&name=spot"
-          curl --user solr_admin:solr_password -H "Content-type: application/json" http://solr:8983/api/collections/ -d "{create: {name: spot-test, config: spot, numShards: 1}}"
       -
         name: Restore installed Gems
         uses: actions/cache@v4
@@ -145,6 +126,14 @@ jobs:
         run: |
           gem install bundler:$(tail -n 1 Gemfile.lock | sed -e "s/ *//")
           bundle install
+      -
+        name: Status check Solr
+        uses: cygnetdigital/wait_for_response@v2.0.0
+        with:
+          url: http://solr:8983/solr/
+          responseCode: 200,301
+          timeout: 10000
+          interval: 1000
       -
         name: Run migrations
         run: bundle exec rake db:migrate

.rspec

@@ -1 +1 @@
---require spec_helper
+--require ./spec/spec_helper.rb --default-path spec

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-09-04 19:26:55 UTC using RuboCop version 1.28.2.
+# on 2025-05-12 16:44:26 UTC using RuboCop version 1.28.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,23 +13,22 @@
 Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
-# Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 215
+# Offense count: 2
+Lint/MissingSuper:
+  Exclude:
+    - 'app/forms/concerns/spot/forms/controlled_vocabulary_form_field.rb'
+    - 'app/forms/concerns/spot/forms/language_tagged_form_fields.rb'
 
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods, inherit_mode.
 # IgnoredMethods: refine
 Metrics/BlockLength:
   Max: 58
 
-# Offense count: 5
+# Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 27
+  Max: 29
 
 # Offense count: 1
 # This cop supports safe auto-correction (--auto-correct).

.ruby-version

@@ -1 +1 @@
-2.7.8
+3.2.9

Dockerfile

@@ -3,27 +3,27 @@
 # !! This is a builder image. Not for general use !!
 # Use this as the base image for the Rails / Sidekiq services.
 ##
-FROM ruby:2.7.8-slim-bullseye AS spot-base
+FROM ruby:3.2.9-slim-bookworm AS spot-base
 
 RUN apt-get clean && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends ca-certificates curl gnupg && \
-    mkdir -p /etc/apt/keyrings && \
-    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
-    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
-    apt-get update -y && apt-get install -y --no-install-recommends \
+    apt-get update -y && \
+    apt-get install -y curl && \
+    curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+    apt-get update -y --fix-missing && apt-get install -y --no-install-recommends \
         awscli \
         build-essential \
         coreutils \
+        cron \
         git \
+        libjemalloc2 \
         libpq-dev \
         libxml2 \
         libxml2-dev \
         libxslt-dev \
         netcat-openbsd \
         nodejs \
         openssl \
-        postgresql-13 \
+        postgresql \
         ruby-dev \
         tzdata \
         zip
@@ -35,12 +35,17 @@ ENV HYRAX_CACHE_PATH=/spot/tmp/cache \
     HYRAX_UPLOAD_PATH=/spot/tmp/uploads \
     BUNDLE_FORCE_RUBY_PLATFORM=1
 
+# configure ruby to use jemalloc + yjit to improve performance
+# @see https://matthaliski.com/blog/upgrading-to-rails-7-1-ruby-3-3-and-jemalloc
+ENV LD_PRELOAD="libjemalloc.so.2" \
+    MALLOC_CONFIG="dirty_decay_ms:1000,narenas:2,background_thread:true,stats_print:true" \
+    RUBY_YJIT_ENABLE="1"
+
 RUN corepack enable
 
-COPY Gemfile.lock /spot/
+COPY Gemfile Gemfile.lock /spot/
 RUN gem install bundler:$(tail -n 1 Gemfile.lock | sed -e 's/\s*//')
 
-COPY Gemfile /spot/
 RUN bundle config unset with && \
     bundle config unset without && \
     bundle config set without "development:test" && \
@@ -50,7 +55,7 @@ ARG build_date=""
 ENV SPOT_BUILD_DATE="$build_date"
 
 ENTRYPOINT ["/spot/bin/spot-entrypoint.sh"]
-CMD ["bundle", "exec", "rails", "server", "-b", "ssl://0.0.0.0:443?key=/spot/tmp/ssl/application.key&cert=/spot/tmp/ssl/application.crt"]
+CMD ["bundle", "exec", "rails", "server", "-b", "ssl://0.0.0.0:443?key=/spot/tmp/ssl/application.key&cert=/spot/tmp/ssl/application.crt&verify_mode=peer"]
 
 HEALTHCHECK CMD curl -skf https://localhost/healthcheck/default || exit 1
 
@@ -132,18 +137,18 @@ RUN unzip -d /tmp/fits /tmp/fits.zip && \
 ##
 FROM spot-base AS spot-worker-base
 # @see https://github.com/mperham/sidekiq/wiki/Memory#bloat
-ENV MALLOC_ARENA_MAX=2
+# ENV MALLOC_ARENA_MAX=2
 # We don't need the entrypoint script to generate an SSL cert
 ENV SKIP_SSL_CERT=true
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        bash \
+RUN apt-get update -y && \
+    apt-get install -y \
         ffmpeg \
         ghostscript \
         imagemagick \
         libreoffice \
         mediainfo \
-        openjdk-11-jre \
+        openjdk-17-jre \
         perl \
         python3 \
         unzip