hyrax 5.0.1 → 5.0.3

data/bin/worker-entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+# Wait for web app to avoid racing during bundle install
+service-wait.sh web:3000
+
+# Run the command
+exec "$@"

data/chart/hyrax/templates/deployment-worker.yaml

@@ -20,7 +20,7 @@ spec:
         {{- include "hyrax.workerSelectorLabels" . | nindent 8 }}
     spec:
       initContainers:
-        - name: db-wait
+        - name: service-wait
           image: "{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
           envFrom:
@@ -35,7 +35,7 @@ spec:
           command:
             - sh
             - -c
-            - db-wait.sh "$REDIS_HOST:6379"
+            - service-wait.sh "$REDIS_HOST:6379"
         {{- if .Values.worker.extraInitContainers }}
         {{- toYaml .Values.worker.extraInitContainers | nindent 8 }}
         {{- end }}

data/config/locales/hyrax.en.yml

@@ -998,6 +998,7 @@ en:
       heading_actions:
         close: Close
         create_work: Create work
+        select_admin_set: Deposit into admin set
         select_type_of_work: Select type of work
       manage_proxies: Manage Proxies
       managed:
@@ -1140,8 +1141,9 @@ en:
         graph_reports: Customized Graph Reports
       stats:
         collections: Collections created
-        file_downloads: Download
-        file_views: View
+        work_views: Metadata View
+        file_downloads: File Download
+        file_views: File View
         files: Files deposited
         heading: Your Statistics
         joined_on: Joined on

data/config/metadata/basic_metadata.yaml

@@ -6,6 +6,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "abstract_sim"
       - "abstract_tesim"
     predicate: http://purl.org/dc/terms/abstract
   access_right:
@@ -14,6 +15,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "access_right_sim"
       - "access_right_tesim"
     predicate: http://purl.org/dc/terms/accessRights
   alternative_title:
@@ -22,6 +24,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "alternative_title_sim"
       - "alternative_title_tesim"
     predicate: http://purl.org/dc/terms/alternative
   arkivo_checksum:
@@ -42,6 +45,11 @@ attributes:
   bibliographic_citation:
     type: string
     multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "bibliographic_citation_sim"
+      - "bibliographic_citation_tesim"
     predicate: http://purl.org/dc/terms/bibliographicCitation
   contributor:
     type: string
@@ -59,6 +67,7 @@ attributes:
       required: true
       primary: true
     index_keys:
+      - "creator_sim"
       - "creator_tesim"
     predicate: http://purl.org/dc/elements/1.1/creator
   date_created:
@@ -67,6 +76,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "date_created_sim"
       - "date_created_tesim"
     predicate: http://purl.org/dc/terms/created
   description:
@@ -75,6 +85,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "description_sim"
       - "description_tesim"
     predicate: http://purl.org/dc/elements/1.1/description
   identifier:
@@ -83,6 +94,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "identifier_sim"
       - "identifier_tesim"
     predicate: http://purl.org/dc/terms/identifier
   import_url:
@@ -103,6 +115,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "publisher_sim"
       - "publisher_tesim"
     predicate: http://purl.org/dc/elements/1.1/publisher
   label:
@@ -110,6 +123,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "label_sim"
       - "label_tesim"
     predicate: info:fedora/fedora-system:def/model#downloadFilename
   language:
@@ -118,6 +132,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "language_sim"
       - "language_tesim"
     predicate: http://purl.org/dc/elements/1.1/language
   license:
@@ -126,6 +141,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "license_sim"
       - "license_tesim"
     predicate: http://purl.org/dc/terms/license
   relative_path:
@@ -137,6 +153,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "related_url_sim"
       - "related_url_tesim"
     predicate: http://www.w3.org/2000/01/rdf-schema#seeAlso
   resource_type:
@@ -154,6 +171,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "rights_notes_sim"
       - "rights_notes_tesim"
     predicate: http://purl.org/dc/elements/1.1/rights
   rights_statement:
@@ -162,6 +180,7 @@ attributes:
     form:
       primary: true
     index_keys:
+      - "rights_statement_sim"
       - "rights_statement_tesim"
     predicate: http://www.europeana.eu/schemas/edm/rights
   source:
@@ -170,6 +189,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "source_sim"
       - "source_tesim"
     predicate: http://purl.org/dc/terms/source
   subject:

data/config/metadata/hyrax_internal_metadata.yaml

@@ -14,7 +14,7 @@ attributes:
   compression:
     predicate: http://vocabulary.samvera.org/ns#compressionScheme
   created_at:
-    predicate: http://purl.org/dc/terms/created
+    predicate: http://vocabulary.samvera.org/ns#created_at
   file_identifier:
     predicate: http://vocabulary.samvera.org/ns#fileIdentifier
   file_ids:

data/docker-compose-dassie.yml

@@ -0,0 +1,167 @@
+services:
+  web:
+    build:
+      context: .
+      target: hyrax-engine-dev
+      args:
+        - EXTRA_APK_PACKAGES=git less
+        - BUNDLE_GEMFILE=Gemfile.dassie
+    image: samvera/hyrax-dev
+    command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
+    stdin_open: true
+    tty: true
+    user: root
+    env_file:
+      - .dassie/.env
+    environment:
+      - RAILS_ROOT=/app/samvera/hyrax-webapp
+    depends_on:
+      - worker
+      - chrome
+      - fcrepo
+      - fits
+      - memcached
+      - postgres
+      - redis
+      - solr
+    ports:
+      - 3000:3000
+      - 9876:9876
+    volumes:
+      - ./bin:/app/samvera
+      - .dassie:/app/samvera/hyrax-webapp
+      - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
+      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
+      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
+    networks:
+      - hyrax
+
+  worker:
+    image: samvera/hyrax-dev
+    entrypoint: worker-entrypoint.sh
+    command: sh -c 'bundle exec sidekiq'
+    user: root
+    env_file:
+      - .dassie/.env
+    depends_on:
+      - fcrepo
+      - fits
+      - memcached
+      - postgres
+      - redis
+      - solr
+    volumes:
+      - ./bin:/app/samvera
+      - .dassie:/app/samvera/hyrax-webapp
+      - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
+      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
+      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
+    networks:
+      - hyrax
+
+  chrome:
+    image: selenium/standalone-chromium:4
+    environment:
+#      - START_XVFB=false
+      - SE_NODE_SESSION_TIMEOUT=800
+      - SE_ENABLE_TRACING=false
+      - SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP=true
+      - SE_BROWSER_ARGS_DISABLE_DSHM=--disable-dev-shm-usage
+      - SE_BROWSER_ARGS_HEADLESS=--headless=new
+#    logging:
+#      driver: none
+    volumes:
+      - /dev/shm:/dev/shm
+    shm_size: 2g
+    ports:
+      - "4445:4444"
+      - "5960:5900"
+    networks:
+      - hyrax
+
+  postgres:
+    image: postgres:15-alpine
+    environment:
+      - POSTGRES_USER=hyrax_user
+      - POSTGRES_PASSWORD=hyrax_password
+      - POSTGRES_DB=hyrax
+      - POSTGRES_HOST_AUTH_METHOD=trust
+    ports:
+      - "5432:5432"
+    volumes:
+      - db:/var/lib/postgresql/data
+    networks:
+      - hyrax
+
+  fcrepo:
+    image: ghcr.io/samvera/fcrepo4:4.7.5
+    volumes:
+      - fcrepo:/data:cached
+    ports:
+      - 8080:8080
+    networks:
+      - hyrax
+
+  fits:
+    image: ghcr.io/samvera/fitsservlet:1.6.0
+    ports:
+      - 8080
+    networks:
+      - hyrax
+
+  memcached:
+    image: bitnami/memcached
+    ports:
+      - '11211:11211'
+    networks:
+      - hyrax
+
+  redis:
+    image: bitnami/redis:6.2
+    env_file:
+      - .dassie/.env
+    volumes:
+      - redis:/bitnami/redis/data
+    networks:
+      - hyrax
+
+  solr:
+    image: solr:8.11
+    ports:
+      - 8983:8983
+    command:
+      - sh
+      - "-c"
+      - "precreate-core hyrax_test /opt/solr/server/configsets/hyraxconf; precreate-core hyrax-valkyrie-test /opt/solr/server/configsets/hyraxconf; precreate-core hyrax-valkyrie-dev /opt/solr/server/configsets/hyraxconf; solr-precreate hyrax /opt/solr/server/configsets/hyraxconf"
+    volumes:
+      - solr_home:/var/solr/data:cached
+      - .dassie/solr/conf:/opt/solr/server/configsets/hyraxconf
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 524288
+    networks:
+      - hyrax
+
+volumes:
+  bundle:
+  db:
+  fcrepo:
+  hyrax-derivatives:
+  hyrax-uploads:
+  rails-public:
+  rails-tmp:
+  redis:
+  solr_home:
+
+networks:
+  hyrax:
+    driver: bridge
+    driver_opts:
+      com.docker.network.bridge.name: br-hyrax

data/docker-compose-koppie.yml

@@ -1,16 +1,14 @@
 # Requires Docker Compose v2
 name: koppie
 services:
-  app: &app
+  web:
     build:
       context: .
       target: hyrax-engine-dev
       args:
         - EXTRA_APK_PACKAGES=git less
-        - APP_PATH=.koppie
         - BUNDLE_GEMFILE=Gemfile.koppie
-    image: samvera/koppie
-    entrypoint: dev-entrypoint.sh
+    image: samvera/hyrax-dev
     command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
@@ -20,8 +18,9 @@ services:
     environment:
       - RAILS_ROOT=/app/samvera/hyrax-webapp
     depends_on:
+      - worker
       - chrome
-      - db_migrate
+      - fits
       - memcached
       - postgres
       - redis
@@ -43,15 +42,15 @@ services:
     networks:
       - koppie
 
-  sidekiq:
-    image: samvera/koppie
-    entrypoint: dev-entrypoint.sh
+  worker:
+    image: samvera/hyrax-dev
+    entrypoint: worker-entrypoint.sh
     command: sh -c 'bundle exec sidekiq'
     user: root
     env_file:
       - .koppie/.env
     depends_on:
-      - db_migrate
+      - fits
       - memcached
       - postgres
       - redis
@@ -69,43 +68,29 @@ services:
     networks:
       - koppie
 
-  db_migrate:
-    image: samvera/koppie
-    user: root
-    env_file:
-      - .koppie/.env
-    entrypoint: dev-entrypoint.sh
-    command: db-migrate-seed.sh
-    depends_on:
-      - postgres
-      - solr
-    volumes:
-      - ./bin:/app/samvera
-      - .koppie:/app/samvera/hyrax-webapp
-      - .:/app/samvera/hyrax-engine
-      - bundle:/app/bundle
-      - rails-public:/app/samvera/hyrax-webapp/public
-      - rails-tmp:/app/samvera/hyrax-webapp/tmp
-    networks:
-      - koppie
-
   chrome:
-    image: seleniarm/standalone-chromium:114.0
+    image: selenium/standalone-chromium:4
     environment:
-      - START_XVFB=false
-    logging:
-      driver: none
+#      - START_XVFB=false
+      - SE_NODE_SESSION_TIMEOUT=800
+      - SE_ENABLE_TRACING=false
+      - SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP=true
+      - SE_BROWSER_ARGS_DISABLE_DSHM=--disable-dev-shm-usage
+      - SE_BROWSER_ARGS_HEADLESS=--headless=new
+#    logging:
+#      driver: none
     volumes:
       - /dev/shm:/dev/shm
-    shm_size: 2G
+    shm_size: 2g
     ports:
       - "4446:4444"
       - "5961:5900"
+      - "7961:7900"
     networks:
       - koppie
 
   postgres:
-    image: postgres:15
+    image: postgres:15-alpine
     env_file:
       - .koppie/.env
     ports:
@@ -145,7 +130,7 @@ services:
     command:
       - sh
       - "-c"
-      - "precreate-core hydra-test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
+      - "precreate-core koppie-test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
     volumes:
       - solr_home:/var/solr/data:cached
       - .koppie/solr/conf:/opt/solr/server/configsets/hyraxconf

data/docker-compose-sirenia.yml

@@ -1,15 +1,14 @@
 # Requires Docker Compose v2
 name: sirenia
 services:
-  app: &app
+  web:
     build:
       context: .
       target: hyrax-engine-dev
       args:
         - EXTRA_APK_PACKAGES=git less
-        - APP_PATH=.koppie
-    image: samvera/koppie
-    entrypoint: dev-entrypoint.sh
+        - BUNDLE_GEMFILE=Gemfile.koppie
+    image: samvera/hyrax-dev
     command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
@@ -22,8 +21,9 @@ services:
       - VALKYRIE_METADATA_ADAPTER=fedora_metadata
       - VALKYRIE_STORAGE_ADAPTER=fedora_storage
     depends_on:
+      - worker
       - chrome
-      - db_migrate
+      - fits
       - memcached
       - postgres
       - redis
@@ -45,19 +45,20 @@ services:
     networks:
       - sirenia
 
-  sidekiq:
-    image: samvera/koppie
-    entrypoint: dev-entrypoint.sh
+  worker:
+    image: samvera/hyrax-dev
+    entrypoint: worker-entrypoint.sh
     command: sh -c 'bundle exec sidekiq'
     user: root
     env_file:
       - .koppie/.env
     environment:
       - APP_NAME=sirenia
+      - RAILS_ROOT=/app/samvera/hyrax-webapp
       - VALKYRIE_METADATA_ADAPTER=fedora_metadata
       - VALKYRIE_STORAGE_ADAPTER=fedora_storage
     depends_on:
-      - db_migrate
+      - fits
       - memcached
       - postgres
       - redis
@@ -75,47 +76,29 @@ services:
     networks:
       - sirenia
 
-  db_migrate:
-    image: samvera/koppie
-    user: root
-    env_file:
-      - .koppie/.env
-    environment:
-      - APP_NAME=sirenia
-      - VALKYRIE_METADATA_ADAPTER=fedora_metadata
-      - VALKYRIE_STORAGE_ADAPTER=fedora_storage
-    entrypoint: dev-entrypoint.sh
-    command: db-migrate-seed.sh
-    depends_on:
-      - postgres
-      - solr
-    volumes:
-      - ./bin:/app/samvera
-      - .koppie:/app/samvera/hyrax-webapp
-      - .:/app/samvera/hyrax-engine
-      - bundle:/app/bundle
-      - rails-public:/app/samvera/hyrax-webapp/public
-      - rails-tmp:/app/samvera/hyrax-webapp/tmp
-    networks:
-      - sirenia
-
   chrome:
-    image: seleniarm/standalone-chromium:114.0
+    image: selenium/standalone-chromium:4
     environment:
-      - START_XVFB=false
-    logging:
-      driver: none
+#      - START_XVFB=false
+      - SE_NODE_SESSION_TIMEOUT=800
+      - SE_ENABLE_TRACING=false
+      - SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP=true
+      - SE_BROWSER_ARGS_DISABLE_DSHM=--disable-dev-shm-usage
+      - SE_BROWSER_ARGS_HEADLESS=--headless=new
+#    logging:
+#      driver: none
     volumes:
       - /dev/shm:/dev/shm
-    shm_size: 2G
+    shm_size: 2g
     ports:
       - "4447:4444"
       - "5962:5900"
+      - "7962:7900"
     networks:
       - sirenia
 
   postgres:
-    image: postgres:15
+    image: postgres:15-alpine
     env_file:
       - .koppie/.env
     ports:
@@ -126,13 +109,16 @@ services:
       - sirenia
 
   fcrepo:
-    image: fcrepo/fcrepo:6.4.0
+    image: fcrepo/fcrepo:6.5.1-RC3-tomcat9
     environment:
       - >-
         CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8
-        -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
-        -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
-      - JAVA_OPTS=-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
+        -server -Xms1G -Xmx2G -XX:NewSize=256m -XX:MaxNewSize=1G
+        -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/mem
+        -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
+        -Dfcrepo.pid.minter.length=2 -Dfcrepo.pid.minter.count=4
+        -Dfcrepo.jms.enabled=false -Dfcrepo.metrics.enable=true
+      - JAVA_OPTS=-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -Dfcrepo.pid.minter.length=2 -Dfcrepo.pid.minter.count=4
     volumes:
       - fcrepo:/fcrepo-home
     ports:
@@ -170,7 +156,7 @@ services:
     command:
       - sh
       - "-c"
-      - "precreate-core hydra-test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
+      - "precreate-core koppie-test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
     volumes:
       - solr_home:/var/solr/data:cached
       - .koppie/solr/conf:/opt/solr/server/configsets/hyraxconf
@@ -181,6 +167,26 @@ services:
     networks:
       - sirenia
 
+##  Fedora Metrics Tools https://wiki.lyrasis.org/display/FEDORA6x/Metrics
+#  prometheus:
+#    image: prom/prometheus:v2.55.1
+#    depends_on:
+#      - fcrepo
+#    ports:
+#      - "9090:9090"
+#    volumes:
+#      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+#    networks:
+#      - sirenia
+#  grafana:
+#    image: grafana/grafana:11.3.1
+#    depends_on:
+#      - fcrepo
+#    ports:
+#      - "3500:3000"
+#    networks:
+#      - sirenia
+
 volumes:
   bundle:
   db: