hyrax 3.4.2 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b16b002450d8ab2e549a1e79a558df2cdcc5a4f906d5cad461a010de5d3083d
-  data.tar.gz: e31cfe1456a09806f220c3a80582c708ea04707fb927dce8bcd1fa897d738c94
+  metadata.gz: f39a5cb135f87ff31b87b65f105d488572df699258a55c12bcc17f7f9e34b9a1
+  data.tar.gz: c1aa78455834f0440debab01d811044787b1749a6825b937d6f23a114c96027e
 SHA512:
-  metadata.gz: c559a06ad78eb3b2e13ab6f11cc7fd0a5ee94a0da1670b0c67557610cf0d65fde294a6998ce46c634bff1a24ad3a17d6eb4755ec7ddf87e7c339ef7c46a0e717
-  data.tar.gz: d95bd5690258a422be6913a1fb7bed33c225288948c74d6864ec3f7740d4791fd7dcca321b89f81efc33083048965102635281ff5b0de815701125a95c8e24f7
+  metadata.gz: e42131c51271b260719032394cdeed9d5c0464b5aeaf97206a276b79ae68a2bb714a6e255ffb3053275ea3c964014648acbfedbf5dbc098ec63089fd3eb25d2e
+  data.tar.gz: c9c2645320f0ddf32e0d190057ee0fe58ac93886c9c104f0293e47ef44add50c8d3b569dedad6bdc02285b95c9993e3c2dc1a438f74a00cdfa8db65875a179d6

data/.circleci/config.yml

@@ -1,18 +1,19 @@
 version: 2.1
 orbs:
-  samvera: samvera/circleci-orb@0
+  samvera: samvera/circleci-orb@1
+  browser-tools: circleci/browser-tools@1.3
 jobs:
   bundle:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.9
+        default: 2.7.6
       bundler_version:
         type: string
-        default: 1.17.3
+        default: 2.3.13
       rails_version:
         type: string
-        default: '5.2.6'
+        default: 6.1.6.1
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
@@ -67,13 +68,13 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.9
+        default: 2.7.6
       bundler_version:
         type: string
-        default: 1.17.3
+        default: 2.3.13
       rails_version:
         type: string
-        default: '5.2.6'
+        default: 6.1.6.1
     executor:
       name: 'samvera/ruby_fcrepo_solr_redis_postgres'
       ruby_version: << parameters.ruby_version >>
@@ -81,20 +82,11 @@ jobs:
     environment:
       RAILS_VERSION: << parameters.rails_version >>
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
-      ENGINE_CART_RAILS_OPTIONS: --database=postgresql --skip-git --skip-bundle --skip-listen --skip-spring --skip-keeps --skip-test --skip-bootsnap
+      ENGINE_CART_RAILS_OPTIONS: --database=postgresql --skip-git --skip-bundle --skip-listen --skip-spring --skip-keeps --skip-test --skip-bootsnap --skip-javascript
       DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test # Hard-coded with data from CircleCI orb, related to https://github.com/samvera-labs/samvera-circleci-orb/issues/42
     steps:
       - attach_workspace:
           at: ~/
-      - when:
-          condition:
-            equal: [ '2.5.9', << parameters.ruby_version >> ]
-          steps:
-            - run:
-                name: "Lock browse everything for Ruby 2.5"
-                command: |
-                  sed -i.bak "s/browse-everything.*/browse-everything\', \'1.1.2\'/" hyrax.gemspec
-                  bundle
       - samvera/engine_cart_generate:
           cache_key: v1-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-{{ checksum ".circleci/config.yml" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
       - samvera/bundle:
@@ -110,10 +102,10 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.9
+        default: 2.7.6
       bundler_version:
         type: string
-        default: 1.17.3
+        default: 2.3.13
       hyrax_valkyrie:
         type: string
         default: "false"
@@ -126,9 +118,26 @@ jobs:
       HYRAX_VALKYRIE: << parameters.hyrax_valkyrie >>
       VALKYRIE_SOLR_PORT: 8985
       DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test # Hard-coded with data from CircleCI orb, related to https://github.com/samvera-labs/samvera-circleci-orb/issues/42
+      KARMA_BROWSER: ChromeHeadlessCustom
+      RAILS_ROOT: .internal_test_app
     steps:
       - attach_workspace:
           at: ~/
+      - run:
+          name: Install system dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get install imagemagick librsvg2-bin
+      - browser-tools/install-chrome
+      - browser-tools/install-chromedriver
+      - run:
+          command: |
+            google-chrome --version
+            chromedriver --version
+          name: Check Chrome install
+      - run:
+          name: Yarn install
+          command: yarn install
       - samvera/install_solr_core:
           solr_config_path: .internal_test_app/solr/conf
       - samvera/install_solr_core:
@@ -159,60 +168,31 @@ jobs:
             --header 'Content-Type: application/json'
 workflows:
   version: 2
-  ruby2-5:
+  ruby2-7-6:
     jobs:
       - bundle:
-          ruby_version: "2.5.9"
-          rails_version: "5.2.6"
+          ruby_version: "2.7.6"
+          rails_version: "6.1.6.1"
+          bundler_version: "2.3.13"
       - build:
-          ruby_version: "2.5.9"
-          rails_version: "5.2.6"
+          ruby_version: "2.7.6"
+          rails_version: "6.1.6.1"
+          bundler_version: "2.3.13"
           requires:
             - bundle
       - test:
-          name: "ruby2-5"
-          ruby_version: "2.5.9"
+          name: "ruby2-7-6"
+          ruby_version: "2.7.6"
+          bundler_version: "2.3.13"
           requires:
             - build
-  ruby2-6:
-    jobs:
-      - bundle:
-          ruby_version: "2.6.7"
-          rails_version: "5.2.6"
-      - build:
-          ruby_version: "2.6.7"
-          rails_version: "5.2.6"
-          requires:
-            - bundle
       - test:
-          name: "ruby2-6"
-          ruby_version: "2.6.7"
-          requires:
-            - build
-      - test:
-          name: "ruby2-6-valkyrie"
-          ruby_version: "2.6.7"
+          name: "ruby2-7-6-valkyrie"
+          ruby_version: "2.7.6"
+          bundler_version: "2.3.13"
           hyrax_valkyrie: "true"
           requires:
             - build
-  ruby2-7:
-    jobs:
-      - bundle:
-          ruby_version: "2.7.4"
-          rails_version: "5.2.6"
-          bundler_version: "2.1.4"
-      - build:
-          ruby_version: "2.7.4"
-          rails_version: "5.2.6"
-          bundler_version: "2.1.4"
-          requires:
-            - bundle
-      - test:
-          name: "ruby2-7"
-          ruby_version: "2.7.4"
-          bundler_version: "2.1.4"
-          requires:
-            - build
   nurax-dev_deploy:
     jobs:
       - deploy:

data/.dassie/.env

@@ -1,4 +1,33 @@
+ANALYTICS_START_DATE=2021-08-21
+CHROME_HEADLESS_MODE=false
+DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
+DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5
+DATABASE_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax?pool=5
+DB_HOST=postgres
+DB_PORT=5432
+FCREPO_HOST=fcrepo
+FCREPO_PORT=8080
+FCREPO_REST_PATH=rest
+FCREPO_TEST_BASE_PATH=/test
+HUB_URL=http://chrome:4444/wd/hub
+HYRAX_ANALYTICS=false
+HYRAX_ANALYTICS_PROVIDER=google
+HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/
+HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
+HYRAX_UPLOAD_PATH=/app/samvera/hyrax-webapp/uploads/
+IN_DOCKER=true
+KARMA_BROWSER=ChromiumHeadlessCustom
 MEMCACHED_HOST=memcached
+RACK_ENV=development
+RAILS_ENV=development
+RAILS_ROOT=.dassie
+REDIS_HOST=redis
 REDIS_PROVIDER=SIDEKIQ_REDIS_URL
 SEED_DASSIE=true
 SIDEKIQ_REDIS_URL=redis://redis:6379/0
+SOLR_HOST=solr
+SOLR_PORT=8983
+SOLR_TEST_URL=http://solr:8983/solr/hyrax_test
+SOLR_URL=http://solr:8983/solr/hyrax
+VALKYRIE_SOLR_HOST=solr
+VALKYRIE_SOLR_PORT=8983

data/.dassie/Gemfile

@@ -8,16 +8,16 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.5'
+ruby '2.7.6'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.4', '>= 5.2.4.4'
+gem 'rails', '~> 6.0'
 # Use postgresql as the database for Active Record
 gem 'pg', '>= 0.18', '< 2.0'
 # Use Puma as the app server
 gem 'puma', '~> 4.3.8'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
+gem 'sass-rails', '~> 6.0'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 
@@ -52,7 +52,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gemspec name: 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
 
-gem 'bootstrap-sass', '~> 3.0'
+gem 'bootstrap', '~> 4.0'
 gem 'devise'
 gem 'devise-guests', '~> 0.6'
 gem 'jquery-rails'

data/.dassie/app/assets/javascripts/application.js

@@ -15,11 +15,15 @@
 //= require turbolinks
 //
 // Required by Blacklight
-//= require jquery
-//= require jquery_ujs
-//= require dataTables/jquery.dataTables
-//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+//= require jquery3
+//= require rails-ujs
+//= require popper
+//= require twitter/typeahead
+//= require bootstrap
+//= require jquery.dataTables
+//= require dataTables.bootstrap4
 //= require blacklight/blacklight
+//= require blacklight_gallery
 
 //= require_tree .
 //= require hyrax

data/.dassie/app/assets/stylesheets/application.css

@@ -11,6 +11,6 @@
  * It is generally better to create a new file per style scope.
  *
  *= require_tree .
- *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+ *= require dataTables.bootstrap4
  *= require_self
  */

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

@@ -4,14 +4,13 @@
  *= require_self
 */
 
-@import "bootstrap-sprockets";
 @import "bootstrap-default-overrides";
 @import 'bootstrap';
-@import 'blacklight/blacklight';
 @import "font-awesome";
 @import "blacklight_gallery/gallery";
 @import "blacklight_gallery/masonry";
 @import "blacklight_gallery/slideshow";
 @import "blacklight_gallery/osd_viewer";
+@import "hyrax/blacklight_gallery";
 @import 'hyrax/hyrax';
 @import 'hyrax/login_signup';

data/.dassie/app/controllers/application_controller.rb

@@ -2,13 +2,11 @@ class ApplicationController < ActionController::Base
   helper Openseadragon::OpenseadragonHelper
   # Adds a few additional behaviors into the application controller
   include Blacklight::Controller
-  skip_after_action :discard_flash_if_xhr
   include Hydra::Controller::ControllerBehavior
 
   # Adds Hyrax behaviors into the application controller
   include Hyrax::Controller
   include Hyrax::ThemedLayoutController
-  with_themed_layout '1_column'
-
 
+  with_themed_layout '1_column'
 end

data/.dassie/app/controllers/catalog_controller.rb

@@ -5,8 +5,6 @@ class CatalogController < ApplicationController
 
   # This filter applies the hydra access controls
   before_action :enforce_show_permissions, only: :show
-  # Allow all search options when in read-only mode
-  skip_before_action :check_read_only
 
   def self.uploaded_field
     "system_create_dtsi"
@@ -17,19 +15,14 @@ class CatalogController < ApplicationController
   end
 
   configure_blacklight do |config|
-    config.view.gallery.partials = [:index_header, :index]
-    config.view.masonry.partials = [:index]
-    config.view.slideshow.partials = [:index]
-
+    config.view.gallery(document_component: Blacklight::Gallery::DocumentComponent)
+    config.view.masonry(document_component: Blacklight::Gallery::DocumentComponent)
+    config.view.slideshow(document_component: Blacklight::Gallery::SlideshowComponent)
 
     config.show.tile_source_field = :content_metadata_image_iiif_info_ssm
     config.show.partials.insert(1, :openseadragon)
     config.search_builder_class = Hyrax::CatalogSearchBuilder
 
-    # Show gallery view
-    config.view.gallery.partials = [:index_header, :index]
-    config.view.slideshow.partials = [:index]
-
     # Because too many times on Samvera tech people raise a problem regarding a failed query to SOLR.
     # Often, it's because they inadvertently exceeded the character limit of a GET request.
     config.http_method = :post
@@ -46,6 +39,17 @@ class CatalogController < ApplicationController
     config.index.display_type_field = "has_model_ssim"
     config.index.thumbnail_field = 'thumbnail_path_ss'
 
+    config.add_results_document_tool(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_results_collection_tool(:sort_widget)
+    config.add_results_collection_tool(:per_page_widget)
+    config.add_results_collection_tool(:view_type_group)
+    config.add_show_tools_partial(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
+    config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
+    config.add_show_tools_partial(:citation)
+    config.add_nav_action(:bookmark, partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?)
+    config.add_nav_action(:search_history, partial: 'blacklight/nav/search_history')
+
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
     config.add_facet_field "human_readable_type_sim", label: "Type", limit: 5
@@ -74,22 +78,22 @@ class CatalogController < ApplicationController
     #   The ordering of the field names is the order of the display
     config.add_index_field "title_tesim", label: "Title", itemprop: 'name', if: false
     config.add_index_field "description_tesim", itemprop: 'description', helper_method: :iconify_auto_link
-    config.add_index_field "keyword_tesim", itemprop: 'keywords', link_to_search: "keyword_sim"
-    config.add_index_field "subject_tesim", itemprop: 'about', link_to_search: "subject_sim"
-    config.add_index_field "creator_tesim", itemprop: 'creator', link_to_search: "creator_sim"
-    config.add_index_field "contributor_tesim", itemprop: 'contributor', link_to_search: "contributor_sim"
+    config.add_index_field "keyword_tesim", itemprop: 'keywords', link_to_facet: "keyword_sim"
+    config.add_index_field "subject_tesim", itemprop: 'about', link_to_facet: "subject_sim"
+    config.add_index_field "creator_tesim", itemprop: 'creator', link_to_facet: "creator_sim"
+    config.add_index_field "contributor_tesim", itemprop: 'contributor', link_to_facet: "contributor_sim"
     config.add_index_field "proxy_depositor_ssim", label: "Depositor", helper_method: :link_to_profile
     config.add_index_field "depositor_tesim", label: "Owner", helper_method: :link_to_profile
-    config.add_index_field "publisher_tesim", itemprop: 'publisher', link_to_search: "publisher_sim"
-    config.add_index_field "based_near_label_tesim", itemprop: 'contentLocation', link_to_search: "based_near_label_sim"
-    config.add_index_field "language_tesim", itemprop: 'inLanguage', link_to_search: "language_sim"
+    config.add_index_field "publisher_tesim", itemprop: 'publisher', link_to_facet: "publisher_sim"
+    config.add_index_field "based_near_label_tesim", itemprop: 'contentLocation', link_to_facet: "based_near_label_sim"
+    config.add_index_field "language_tesim", itemprop: 'inLanguage', link_to_facet: "language_sim"
     config.add_index_field "date_uploaded_dtsi", itemprop: 'datePublished', helper_method: :human_readable_date
     config.add_index_field "date_modified_dtsi", itemprop: 'dateModified', helper_method: :human_readable_date
     config.add_index_field "date_created_tesim", itemprop: 'dateCreated'
     config.add_index_field "rights_statement_tesim", helper_method: :rights_statement_links
     config.add_index_field "license_tesim", helper_method: :license_links
-    config.add_index_field "resource_type_tesim", label: "Resource Type", link_to_search: "resource_type_sim"
-    config.add_index_field "file_format_tesim", link_to_search: "file_format_sim"
+    config.add_index_field "resource_type_tesim", label: "Resource Type", link_to_facet: "resource_type_sim"
+    config.add_index_field "file_format_tesim", link_to_facet: "file_format_sim"
     config.add_index_field "identifier_tesim", helper_method: :index_field_link, field_name: 'identifier'
     config.add_index_field Hydra.config.permissions.embargo.release_date, label: "Embargo release date", helper_method: :human_readable_date
     config.add_index_field Hydra.config.permissions.lease.expiration_date, label: "Lease expiration date", helper_method: :human_readable_date

data/.dassie/app/models/user.rb

@@ -5,9 +5,6 @@ class User < ApplicationRecord
   include Hyrax::User
   include Hyrax::UserUsageStats
 
-  if Blacklight::Utils.needs_attr_accessible?
-    attr_accessible :email, :password, :password_confirmation
-  end
   # Connects this user object to Blacklights Bookmarks.
   include Blacklight::User
   # Include default devise modules. Others available are:

data/.dassie/config/application.rb

@@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
 module Dassie
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    config.load_defaults 6.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers

data/.dassie/config/initializers/riiif.rb

@@ -20,7 +20,7 @@ ActiveSupport::Reloader.to_prepare do
     end
   end
 
-  Riiif::Image.authorization_service = Hyrax::IIIFAuthorizationService
+  Riiif::Image.authorization_service = Hyrax::IiifAuthorizationService
 
   Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
   Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')

data/.dassie/db/schema.rb

@@ -2,11 +2,11 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 

data/.dassie/package.json

@@ -3,13 +3,13 @@
   "private": true,
   "repository": "git@github.com:samvera/hyrax.git",
   "dependencies": {
-  "universalviewer": "^3.0.16"
-},
-"scripts": {
-  "preinstall": "rm -rf ./public/uv",
-  "postinstall": "yarn run uv-install && yarn run uv-config",
-  "uv-install": "cp -r ./node_modules/universalviewer/dist ./public/uv",
-  "uv-config": "cp ./config/uv/uv.html ./public/uv/uv.html & cp ./config/uv/uv-config.json ./public/uv/"
+    "universalviewer": "^3.1.4"
+  },
+  "scripts": {
+    "preinstall": "rm -rf ./public/uv",
+    "postinstall": "yarn run uv-install && yarn run uv-config",
+    "uv-install": "cp -r ./node_modules/universalviewer/dist ./public/uv",
+    "uv-config": "cp ./config/uv/uv.html ./public/uv/uv.html & cp ./config/uv/uv-config.json ./public/uv/"
   },
   "devDependencies": {}
 }

data/.engine_cart.yml

@@ -1,40 +1,3 @@
-# Greetings Hyrax developer, you may be surprised to see this file.
-# Hyrax is moving to using Postgresql for testing in CircleCI and
-# hopefully by Hyrax developers during local development. Previously,
-# we used sqlite.
-#
-# And while installing Postgresql is beyond the scope of this
-# community, I (Jeremy) installed Postgresql via homebrew (brew.sh),
-# and have used the following for testing (note `hyrax-testup` is
-# defined later on):
-#
-# ```console
-# hyrax-testup
-# brew services start postgresql
-# export DATABASE_URL="postgresql://localhost:5432/internal_development"
-# bundle exec rspec
-# ```
-#
-# But, before running that, I have a shell alias (see
-# https://github.com/jeremyf/dotzshrc/blob/trunk/configs/aliases.zsh)
-# that I call.  The alias ensures that I have:
-#
-#   * clean set of solr indices
-#   * running solr indices
-#   * running fcrepo
-#   * running redis server
-#
-# ```console
-# alias hyrax-testup='cd $HOME/git/samvera/hyrax/.internal_test_app ; \
-#   rm -rf tmp/solr-valkyrie-test/server/solr/hyrax-valkyrie-test ; \
-#   rm -rf tmp/solr-test/server/solr/hydra-test ; \
-#   fcrepo_wrapper --config config/fcrepo_wrapper_test.yml & \
-#   solr_wrapper --config config/solr_wrapper_test.yml & \
-#   solr_wrapper --config config/solr_wrapper_valkyrie_test.yml & \
-#   redis-server &'
-# ```
-#
-# Best luck, and I (Jeremy) hope to add this to the Wiki at some point
-# once this current code is accepted into the main-line.
 rails_options:
-  - "--database=postgresql" # Caution, as you may only get "one option" until this is merged. https://github.com/cbeer/engine_cart/pull/102
+  - "--database=postgresql"
+  - "--skip-javascript"

data/.github/workflows/build.yml

@@ -0,0 +1,79 @@
+name: Build and push docker image
+on:
+  workflow_dispatch:
+  release:
+  push:
+    branches:
+      - build_images_on_release
+
+env:
+  REGISTRY: ghcr.io
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set env
+        run: echo "TAG=${GITHUB_SHA::8}" >> $GITHUB_ENV
+      - name: Downcase repo
+        run: echo "REPO_LOWER=${REPO,,}" >> $GITHUB_ENV
+        env:
+          REPO: '${{ github.repository }}'
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Github Container Login
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          target: hyrax-base
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/hyrax-base:${{ env.TAG }}
+            ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/hyrax-base:${{ github.ref_name }}
+      - name: Build and push worker
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          target: hyrax-worker-base
+          cache-from: |
+            ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}:${TAG}
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/hyrax-worker-base:${{ env.TAG }}
+            ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/hyrax-worker-base:${{ github.ref_name }}
+      - name: Build and push dassie
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          target: hyrax-engine-dev
+          cache-from: |
+            ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}:${TAG}
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/dassie:${{ env.TAG }}
+            ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/dassie:${{ github.ref_name }}
+      - name: Build and push dassie worker
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          target: hyrax-engine-dev-worker
+          cache-from: |
+            ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/dassie:${TAG}
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/dassie-worker:${{ env.TAG }}
+            ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/dassie-worker:${{ github.ref_name }}

data/{.env → .koppie/.env}

@@ -1,28 +1,39 @@
-ANALYTICS_START_DATE=2021-08-21
 CHROME_HEADLESS_MODE=false
 DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5
 DATABASE_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax?pool=5
 DB_HOST=postgres
+DB_NAME=koppie
+DB_PASSWORD=hyrax_password
 DB_PORT=5432
-FCREPO_HOST=fcrepo
-FCREPO_PORT=8080
-FCREPO_REST_PATH=rest
-FCREPO_TEST_BASE_PATH=/test
+DB_USERNAME=hyrax_user
 HUB_URL=http://chrome:4444/wd/hub
-HYRAX_ANALYTICS=false
-HYRAX_ANALYTICS_PROVIDER=google
 HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/
 HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
 HYRAX_UPLOAD_PATH=/app/samvera/hyrax-webapp/uploads/
+HYRAX_VALKYRIE=true
 IN_DOCKER=true
+METADATA_DATABASE_NAME=koppie_metadata_development
+POSTGRES_DB=koppie
+POSTGRES_HOST_AUTH_METHOD=trust
+POSTGRES_PASSWORD=hyrax_password
+POSTGRES_USER=hyrax_user
 RACK_ENV=development
 RAILS_ENV=development
-RAILS_ROOT=.dassie
+RAILS_ROOT=.koppie
+RAILS_LOG_TO_STDOUT=true
+RAILS_QUEUE=sidekiq
 REDIS_HOST=redis
+REDIS_PASSWORD=sidekickin
+REDIS_URL=redis://noop:sidekickin@redis:6379
+SEED_KOPPIE=true
+SKIP_SELENIUM=
+SOLR_COLLECTION_NAME=koppie
+SOLR_CORE_CONF_DIR=/opt/solr/server/configsets/hyraxconf
+SOLR_CORES=koppie
 SOLR_HOST=solr
 SOLR_PORT=8983
-SOLR_TEST_URL=http://solr:8983/solr/hyrax_test
-SOLR_URL=http://solr:8983/solr/hyrax
+SOLR_URL=http://solr:8983/solr/koppie
+VALKYRIE_SOLR_CORE=koppie
 VALKYRIE_SOLR_HOST=solr
 VALKYRIE_SOLR_PORT=8983