hyrax 5.0.4 → 5.1.0

data/Dockerfile

@@ -1,49 +1,98 @@
-ARG ALPINE_VERSION=3.19
-ARG RUBY_VERSION=3.2.6
-
-FROM ruby:$RUBY_VERSION-alpine$ALPINE_VERSION AS hyrax-base
-
-ARG DATABASE_APK_PACKAGE="postgresql-dev"
-ARG EXTRA_APK_PACKAGES="git"
-ARG RUBYGEMS_VERSION=""
-
-RUN apk --no-cache upgrade && \
-  apk --no-cache add acl \
-  build-base \
-  curl \
-  gcompat \
-  imagemagick \
-  imagemagick-heic \
-  imagemagick-jpeg \
-  imagemagick-jxl \
-  imagemagick-pdf \
-  imagemagick-svg \
-  imagemagick-tiff \
-  imagemagick-webp \
-  jemalloc \
-  ruby-grpc \
-  tzdata \
-  nodejs \
-  yarn \
-  zip \
-  $DATABASE_APK_PACKAGE \
-  $EXTRA_APK_PACKAGES
+ARG DEBIAN_VERSION=bookworm
+ARG RUBY_VERSION=3.3
+
+FROM ruby:$RUBY_VERSION-$DEBIAN_VERSION AS hyrax-base
+
+RUN apt-get update && \
+    curl -sL "https://deb.nodesource.com/setup_20.x" | bash - && \
+    apt-get install -y --no-install-recommends \
+    acl \
+    build-essential \
+    curl \
+    exiftool \
+    ffmpeg \
+    ghostscript \
+    git \
+    less \
+    libgsf-1-dev \
+    libimagequant-dev \
+    libjemalloc2 \
+    libjpeg62-turbo-dev \
+    libopenjp2-7-dev \
+    libopenjp2-tools \
+    libpng-dev \
+    libpoppler-cpp-dev \
+    libpoppler-dev \
+    libpoppler-glib-dev \
+    libpoppler-private-dev \
+    libpoppler-qt5-dev \
+    libreoffice \
+    libreoffice-l10n-uk \
+    librsvg2-dev \
+    libtiff-dev \
+    libvips-dev \
+    libvips-tools \
+    libwebp-dev \
+    libxml2-dev \
+    lsof \
+    mediainfo \
+    netcat-openbsd \
+    nodejs \
+    perl \
+    poppler-utils \
+    postgresql-client \
+    rsync \
+    ruby-grpc \
+    screen \
+    tesseract-ocr \
+    tzdata \
+    vim \
+    zip \
+    && \
+    npm install --global yarn && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* && \
+    ln -s /usr/lib/*-linux-gnu/libjemalloc.so.2 /usr/lib/libjemalloc.so.2 && \
+    echo "******** Packages Installed *********"
+
+RUN bash -x -c "\
+    if [ $(dpkg --print-architecture) = 'amd64' ]; then \
+      wget https://github.com/ImageMagick/ImageMagick/releases/download/7.1.1-47/ImageMagick-82572af-gcc-x86_64.AppImage -O magick \
+        && chmod a+x magick \
+        && ./magick --appimage-extract \
+        && mv squashfs-root/usr/etc/ImageMagick*  /etc \
+        && rm -rf squashfs-root/usr/share/doc \
+        && cp -rv squashfs-root/usr/*  /usr/local \
+        && rm -rf magick squashfs-root ; \
+    else \
+      wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-47.tar.gz \
+        && tar xf 7.1.1-47.tar.gz \
+        && cd ImageMagick* \
+        && ./configure \
+        && make install \
+        && ldconfig /usr/local/lib \
+        && cd $OLDPWD \
+        && rm -rf 7.1.1-47.tar.gz ImageMagick* ; \
+    fi \
+    && identify -version"
 
 RUN setfacl -d -m o::rwx /usr/local/bundle && \
-  gem update --silent --system $RUBYGEMS_VERSION
+    gem update --silent --system
 
-RUN addgroup -S --gid 101 app && \
-  adduser -S -G app -u 1001 -s /bin/sh -h /app app
-USER app
+RUN useradd -m -u 1001 -U -s /bin/bash --home-dir /app app && \
+    mkdir -p /app/samvera/hyrax-webapp && \
+    chown -R app:app /app && \
+    echo "export PATH=/app/samvera/hyrax-webapp/bin:${PATH}" >> /etc/bash.bashrc
 
-RUN mkdir -p /app/samvera/hyrax-webapp
+USER app
 WORKDIR /app/samvera/hyrax-webapp
 
-COPY --chown=1001:101 ./bin/*.sh /app/samvera/
+COPY --chown=1001 ./bin/*.sh /app/samvera/
 ENV PATH="/app/samvera:$PATH" \
     RAILS_ROOT="/app/samvera/hyrax-webapp" \
     RAILS_SERVE_STATIC_FILES="1" \
-    LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"
+    LD_PRELOAD="/usr/lib/libjemalloc.so.2" \
+    MALLOC_CONF="dirty_decay_ms:1000,narenas:2,background_thread:true"
 
 ENTRYPOINT ["hyrax-entrypoint.sh"]
 CMD ["bundle", "exec", "puma", "-v", "-b", "tcp://0.0.0.0:3000"]
@@ -54,22 +103,23 @@ FROM hyrax-base AS hyrax
 ARG APP_PATH=.
 ARG BUNDLE_WITHOUT="development test"
 
-ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
+ONBUILD COPY --chown=1001 $APP_PATH /app/samvera/hyrax-webapp
 ONBUILD RUN bundle install --jobs "$(nproc)"
-ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
+ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DATABASE_URL='nulldb://nulldb' bundle exec rake assets:precompile
+ARG BUILD_GITSHA
+ARG BUILD_TIMESTAMP
+ENV BUILD_GITSHA=$BUILD_GITSHA \
+    BUILD_TIMESTAMP=$BUILD_TIMESTAMP
 
 
 FROM hyrax-base AS hyrax-worker-base
-
 USER root
-RUN apk --no-cache add bash \
-  ffmpeg \
-  mediainfo \
-  openjdk17-jre \
-  perl
-USER app
 
-RUN mkdir -p /app/fits && \
+RUN apt update && \
+    apt install -y --no-install-recommends default-jre-headless && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* && \
+    mkdir -p /app/fits && \
     cd /app/fits && \
     wget https://github.com/harvard-lts/fits/releases/download/1.6.0/fits-1.6.0.zip -O fits.zip && \
     unzip fits.zip && \
@@ -88,7 +138,11 @@ ARG BUNDLE_WITHOUT="development test"
 
 ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 ONBUILD RUN bundle install --jobs "$(nproc)"
-ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
+ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DATABASE_URL='nulldb://nulldb' bundle exec rake assets:precompile
+ARG BUILD_GITSHA
+ARG BUILD_TIMESTAMP
+ENV BUILD_GITSHA=$BUILD_GITSHA \
+    BUILD_TIMESTAMP=$BUILD_TIMESTAMP
 
 
 FROM hyrax-worker-base AS hyrax-engine-dev
@@ -97,8 +151,9 @@ USER app
 ARG BUNDLE_WITHOUT=
 ENV HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
 
-COPY --chown=1001:101 .dassie /app/samvera/hyrax-webapp
-COPY --chown=1001:101 . /app/samvera/hyrax-engine
+COPY --chown=1001 .dassie /app/samvera/hyrax-webapp
+COPY --chown=1001 .koppie /app/samvera/hyrax-koppie
+COPY --chown=1001 . /app/samvera/hyrax-engine
 
 RUN bundle -v && \
   BUNDLE_GEMFILE=Gemfile.dassie bundle install --jobs "$(nproc)" && yarn && \
@@ -106,4 +161,8 @@ RUN bundle -v && \
   yarn cache clean
 
 ENTRYPOINT ["dev-entrypoint.sh"]
-CMD ["bundle", "exec", "puma", "-v", "-b", "tcp://0.0.0.0:3000"]
+CMD ["bundle", "exec", "puma", "-v", "-b", "tcp://0.0.0.0:3000"]
+ARG BUILD_GITSHA
+ARG BUILD_TIMESTAMP
+ENV BUILD_GITSHA=$BUILD_GITSHA \
+    BUILD_TIMESTAMP=$BUILD_TIMESTAMP

data/app/actors/hyrax/actors/add_to_work_actor.rb

@@ -69,7 +69,7 @@ module Hyrax
       end
 
       def add_permissions_error(work)
-        work.errors[:in_works_ids] << "Works can only be related to each other if user has ability to edit both."
+        work.errors.add(:in_works_ids, "Works can only be related to each other if user has ability to edit both.")
       end
     end
   end

data/app/actors/hyrax/actors/apply_order_actor.rb

@@ -41,7 +41,7 @@ module Hyrax
             env.curation_concern.ordered_members << work
             env.curation_concern.save!
           else
-            env.curation_concern.errors[:ordered_member_ids] << "Works can only be related to each other if user has ability to edit both."
+            env.curation_concern.errors.add(:ordered_member_ids, "Works can only be related to each other if user has ability to edit both.")
           end
         end
       end

data/app/assets/stylesheets/hyrax/_tinymce.scss

@@ -12,3 +12,9 @@
 .home_marketing_text #content_block_external_key {
   color: black;
 }
+
+// Prevents text from being clipped in Tiny MCE bottom status bar and drop-down style menu (Issue #6789)
+.tox .tox-statusbar { overflow: visible !important; }
+.tox .tox-tbtn--bespoke .tox-tbtn__select-label { overflow: visible !important; }
+.tox .tox-tbtn { overflow: visible !important; }
+.tox-tinymce { overflow: visible !important; }

data/app/controllers/concerns/hyrax/works_controller_behavior.rb

@@ -360,6 +360,7 @@ module Hyrax
       # that they have not removed from the upload widget.
       uploaded_files = params.fetch(:uploaded_files, [])
       selected_files = params.fetch(:selected_files, {}).values
+                             .map { |f| f.permit(:expires, :file_name, :url, {}) }
       browse_everything_urls = uploaded_files &
                                selected_files.map { |f| f[:url] }
 

data/app/controllers/hyrax/admin/permission_template_accesses_controller.rb

@@ -21,14 +21,14 @@ module Hyrax
 
       def after_destroy_error
         if source.admin_set?
-          @permission_template_access.errors[:base] <<
-            t('hyrax.admin.admin_sets.form.permission_destroy_errors.participants')
+          @permission_template_access.errors.add(:base,
+            t('hyrax.admin.admin_sets.form.permission_destroy_errors.participants'))
           redirect_to hyrax.edit_admin_admin_set_path(source_id,
                                                       anchor: 'participants'),
                       alert: @permission_template_access.errors.full_messages.to_sentence
         else
-          @permission_template_access.errors[:base] <<
-            t('hyrax.dashboard.collections.form.permission_update_errors.sharing')
+          @permission_template_access.errors.add(:base,
+            t('hyrax.dashboard.collections.form.permission_update_errors.sharing'))
           redirect_to hyrax.edit_dashboard_collection_path(source_id,
                                                            anchor: 'sharing'),
                       alert: @permission_template_access.errors.full_messages.to_sentence

data/app/controllers/hyrax/api/zotero_controller.rb

@@ -14,7 +14,7 @@ module Hyrax
         session[:request_token] = request_token
         current_user.zotero_token = request_token
         current_user.save
-        redirect_to request_token.authorize_url(identity: '1', oauth_callback: callback_url)
+        redirect_to request_token.authorize_url(identity: '1', oauth_callback: callback_url), allow_other_host: true
       rescue OAuth::Unauthorized
         redirect_to root_url, alert: 'Invalid Zotero client key pair'
       end

data/app/controllers/hyrax/file_sets_controller.rb

@@ -9,6 +9,10 @@ module Hyrax
 
     before_action :authenticate_user!, except: [:show, :citation, :stats]
     load_and_authorize_resource class: Hyrax.config.file_set_class
+    # If Hyrax.config.file_set_class is set to ::FileSet, the load above will force-cast
+    # the instance as a ::FileSet, even if it is a Hyrax::FileSet. Re-cast it back to
+    # prevent method errors and nil objects later
+    before_action :cast_file_set
     before_action :build_breadcrumbs, only: [:show, :edit, :stats]
     before_action do
       blacklight_config.track_search_session = false
@@ -159,6 +163,13 @@ module Hyrax
       attrs
     end
 
+    def cast_file_set
+      return unless @file_set.class == ::FileSet
+      # We can tell if a Hyrax::FileSet was improperly cast because this AF method will
+      # return nil since its parent is not a ActiveFedora work.
+      @file_set = @file_set.valkyrie_resource if @file_set.parent&.id.nil?
+    end
+
     def parent(file_set: curation_concern)
       @parent ||=
         case file_set

data/app/jobs/batch_create_job.rb

@@ -32,8 +32,8 @@ class BatchCreateJob < Hyrax::ApplicationJob
       title = [titles[upload_id]] if titles[upload_id]
       resource_type = Array.wrap(resource_types[upload_id]) if resource_types[upload_id]
       job_attributes = job_attributes.merge(uploaded_files: [upload_id],
-                                    title: title,
-                                    resource_type: resource_type)
+                                            title: title,
+                                            resource_type: resource_type)
       child_operation = Hyrax::Operation.create!(user: user,
                                                  operation_type: "Create Work",
                                                  parent: operation)

data/app/models/admin_set.rb

@@ -105,13 +105,13 @@ class AdminSet < ActiveFedora::Base
 
   def check_if_empty
     return true if members.empty?
-    errors[:base] << I18n.t('hyrax.admin.admin_sets.delete.error_not_empty')
+    errors.add(:base, I18n.t('hyrax.admin.admin_sets.delete.error_not_empty'))
     throw :abort
   end
 
   def check_if_not_default_set
     return true unless Hyrax::AdminSetCreateService.default_admin_set?(id: id)
-    errors[:base] << I18n.t('hyrax.admin.admin_sets.delete.error_default_set')
+    errors.add(:base, I18n.t('hyrax.admin.admin_sets.delete.error_default_set'))
     throw :abort
   end
 end

data/app/models/concerns/hyrax/permissions/writable.rb

@@ -23,8 +23,7 @@ module Hyrax
         valid = true
         paranoid_edit_permissions.each do |validation|
           next unless validation[:condition].call(self)
-          errors[validation[:key]] ||= []
-          errors[validation[:key]] << validation[:message]
+          errors.add(validation[:key], validation[:message])
           valid = false
         end
         valid

data/app/models/concerns/hyrax/valkyrie_lazy_migration.rb

@@ -22,6 +22,7 @@ module Hyrax
         instance_variables.each do |ivar|
           next if ivar == :@name
           next if ivar == :@klass
+          next if ivar == :@uncountable
           instance_variable_set(ivar, legacy_model.model_name.send(ivar[1..-1]))
         end
       end

data/app/models/hyrax/collection_type.rb

@@ -163,26 +163,26 @@ module Hyrax
 
     def ensure_no_collections
       return true unless collections?
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.not_empty')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.not_empty'))
       throw :abort
     end
 
     def ensure_no_settings_changes_for_admin_set_type
       return true unless admin_set? && collection_type_settings_changed? && exists_for_machine_id?(ADMIN_SET_MACHINE_ID)
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_admin_sets')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_admin_sets'))
       throw :abort
     end
 
     def ensure_no_settings_changes_for_user_collection_type
       return true unless user_collection? && collection_type_settings_changed? && exists_for_machine_id?(USER_COLLECTION_MACHINE_ID)
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_user_collections')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_user_collections'))
       throw :abort
     end
 
     def ensure_no_settings_changes_if_collections_exist
       return true unless collections?
       return true unless collection_type_settings_changed?
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.no_settings_change_if_not_empty')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.no_settings_change_if_not_empty'))
       throw :abort
     end
 

data/app/models/single_use_link.rb

@@ -31,7 +31,7 @@ class SingleUseLink < ActiveRecord::Base
   end
 
   def cannot_be_destroyed
-    errors[:base] << "Single Use Link has already been used" if destroyed?
+    errors.add(:base, "Single Use Link has already been used") if destroyed?
   end
 
   def set_defaults

data/app/services/hyrax/listeners.rb

@@ -20,6 +20,7 @@ module Hyrax
     autoload :ACLIndexListener
     autoload :ActiveFedoraACLIndexListener
     autoload :BatchNotificationListener
+    autoload :FileListener
     autoload :FileMetadataListener
     autoload :FileSetLifecycleListener
     autoload :FileSetLifecycleNotificationListener

data/app/services/hyrax/statistics/term_query.rb

@@ -59,7 +59,7 @@ module Hyrax
         end
 
         # Allows us to create a Flot charts pie-graph
-        def as_json(opts)
+        def as_json(opts = nil)
           @data.as_json(opts)
         end
       end

data/app/services/hyrax/user_stat_importer.rb

@@ -49,7 +49,7 @@ module Hyrax
 
     def process_files(stats, user, start_date)
       file_ids_for_user(user).each do |file_id|
-        file = ::FileSet.find(file_id)
+        file = Hyrax.query_service.find_by(id: file_id)
         view_stats = extract_stats_for(object: file, from: FileViewStat, start_date: start_date, user: user)
         stats = tally_results(view_stats, :views, stats) if view_stats.present?
         delay

data/app/services/hyrax/workflow.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+module Hyrax
+  module Workflow
+    extend ActiveSupport::Autoload
+
+    autoload :WorkflowFactory
+  end
+end

data/app/validators/hyrax/has_one_title_validator.rb

@@ -4,7 +4,7 @@ module Hyrax
   class HasOneTitleValidator < ActiveModel::Validator
     def validate(record)
       return unless record.title.reject(&:empty?).empty?
-      record.errors[:title] << "You must provide a title"
+      record.errors.add(:title, "You must provide a title")
     end
   end
 end

data/app/views/hyrax/base/iiif_viewers/_universal_viewer.html.erb

@@ -1,5 +1,5 @@
 <div class="viewer-wrapper">
-  <iframe aria-label="image view" 
+  <iframe title="image view" 
     src="<%= universal_viewer_base_url %>#?manifest=<%= main_app.polymorphic_url [main_app, :manifest, presenter], { locale: nil } %>&config=<%= universal_viewer_config_url %>" 
     allowfullscreen="true" 
     frameborder="0" 

data/bin/db-migrate-seed.sh

@@ -2,7 +2,7 @@
 set -e
 
 service-wait.sh "$DB_HOST:$DB_PORT"
-bundle exec rails db:create
+bundle exec rails db:prepare
 bundle exec rails db:migrate
 
 if [ "$FCREPO_HOST" ]; then

data/bin/dev-entrypoint.sh

@@ -12,6 +12,9 @@ cp -Rn /usr/local/bundle/* /app/bundle/ruby/$RUBY_MAJOR.0
 bundle install
 yarn install
 
+# Precompile assets if running in production (Nurax)
+[ "$RAILS_ENV" = "production" ] && bundle exec rake assets:precompile
+
 db-migrate-seed.sh
 
 # Run the command

data/config/initializers/1_healthz.rb

@@ -9,7 +9,8 @@
 # application's `Gemfile`.
 #
 # @see https://github.com/sportngin/okcomputer/
-begin
+
+Rails.application.reloader.to_prepare do
   OkComputer.mount_at = 'healthz'
 
   require 'hyrax/health_checks'

data/config/initializers/ar_test_fixture_monkey_patch.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+module ActiveRecord
+  module TestFixtures
+    def fixture_path
+      fixture_paths[0]
+    end
+  end
+end

data/config/initializers/arel_rails_7_2_monkey_patch.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class Arel::Table
+  def table_name
+    name
+  end
+end

data/config/initializers/listeners.rb

@@ -2,8 +2,10 @@
 
 Hyrax.publisher.subscribe(Hyrax::Listeners::ActiveFedoraACLIndexListener.new) unless Hyrax.config.disable_wings
 
-Hyrax.publisher.default_listeners.each do |listener|
-  Hyrax.publisher.subscribe(listener)
+Rails.application.reloader.to_prepare do
+  Hyrax.publisher.default_listeners.each do |listener|
+    Hyrax.publisher.subscribe(listener)
+  end
 end
 
 # Publish events from old style Hyrax::Callbacks to trigger the listeners

data/config/initializers/new_framework_defaults_7_2.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Any options set here are to override Rails 7.2 configuration defaults
+
+# These fix a couple of issues arising from Rails 7.2 enforcement of HTML5 semantics
+# by default when using certain Rails methods
+Rails.application.config.action_view.button_to_generates_button_tag = false
+Rails.application.config.action_view.sanitizer_vendor = Rails::HTML4::Sanitizer

data/docker-compose-dassie.yml

@@ -6,7 +6,7 @@ services:
       args:
         - EXTRA_APK_PACKAGES=git less
         - BUNDLE_GEMFILE=Gemfile.dassie
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
@@ -40,7 +40,7 @@ services:
       - hyrax
 
   worker:
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     entrypoint: worker-entrypoint.sh
     command: sh -c 'bundle exec sidekiq'
     user: root

data/docker-compose-koppie.yml

@@ -8,7 +8,7 @@ services:
       args:
         - EXTRA_APK_PACKAGES=git less
         - BUNDLE_GEMFILE=Gemfile.koppie
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
@@ -43,7 +43,7 @@ services:
       - koppie
 
   worker:
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     entrypoint: worker-entrypoint.sh
     command: sh -c 'bundle exec sidekiq'
     user: root

data/docker-compose-sirenia.yml

@@ -8,7 +8,7 @@ services:
       args:
         - EXTRA_APK_PACKAGES=git less
         - BUNDLE_GEMFILE=Gemfile.koppie
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
@@ -46,7 +46,7 @@ services:
       - sirenia
 
   worker:
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     entrypoint: worker-entrypoint.sh
     command: sh -c 'bundle exec sidekiq'
     user: root
@@ -109,7 +109,7 @@ services:
       - sirenia
 
   fcrepo:
-    image: fcrepo/fcrepo:6.5.1-RC3-tomcat9
+    image: fcrepo/fcrepo:6.5.1-tomcat9
     environment:
       - >-
         CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8

data/documentation/developing-your-hyrax-based-app.md

@@ -32,7 +32,7 @@ You can also try [Running Hyrax-based application in local VM](https://github.co
 During development, running only the dependent services in a container environment may be beneficial. This avoids potential headaches concerning file permissions and eases the use of debugging tools. The application generation instructions below use [Lando](https://lando.dev) to achieve this setup.
 
 This document contains instructions specific to setting up an app with __Hyrax
-v5.0.4__. If you are looking for instructions on installing a different
+v5.1.0__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -46,7 +46,7 @@ Prerequisites are required for both creating a Hyrax\-based app and contributing
 Hyrax requires the following software to work:
 
 1. [Solr](http://lucene.apache.org/solr/) version >= 5.x (tested up to 8.11.1, which includes the log4j library update)
-1. [Fedora Commons](http://www.fedora-commons.org/) digital repository version >= 4.7.6 (if not using the Valkyrie Postgres adapter)
+1. [Fedora Commons](http://www.fedora-commons.org/) digital repository version >= 4.7.6 && < 5 (if using legacy ActiveFedora) or >= 6.5.1 (if using the Valkyrie Fedora adapter)
 1. A SQL RDBMS ([PostgreSQL](https://www.postgresql.org) recommended)
 1. [Redis](http://redis.io/), a key-value store
 1. [ImageMagick](http://www.imagemagick.org/) with JPEG-2000 support
@@ -102,7 +102,7 @@ Once ffmpeg has been installed, enable transcoding by setting `config.enable_ffm
 
 First, you'll need a working Ruby installation. You can install this via your operating system's package manager -- you are likely to get farther with OSX, Linux, or UNIX than Windows but your mileage may vary -- but we recommend using a Ruby version manager such as [RVM](https://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv).
 
-Hyrax supports Ruby 3.2. When starting a new project, we recommend using the latest Ruby 3.2 version.
+Hyrax supports Ruby 3.3. When starting a new project, we recommend using the latest Ruby 3.3 version.
 
 ## Redis
 
@@ -112,11 +112,11 @@ Starting up Redis will depend on your operating system, and may in fact already
 
 ## Rails
 
-Hyrax requires Rails 6. We recommend the latest Rails 6.1 release.
+Hyrax requires Rails 7. We recommend the latest Rails 7.2 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 6.1.7.7
+gem install rails -v 7.2.2.1
 ```
 
 ### JavaScript runtime
@@ -148,7 +148,7 @@ Generate a new Rails application using the template.
 **NOTE:** `HYRAX_SKIP_WINGS` is needed here to avoid loading the Wings compatibility layer during the application generation process.
 
 ```shell
-HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.4/template.rb
+HYRAX_SKIP_WINGS=true rails _7.2.2.1_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.1.0-beta1/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including: