hyrax 5.0.0 → 5.0.3

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:

data/docker-compose.yml

@@ -1,183 +1,2 @@
-version: '3.7'
-
-services:
-  app: &app
-    build:
-      context: .
-      target: hyrax-engine-dev
-      args:
-        - EXTRA_APK_PACKAGES=git less
-        - BUNDLE_GEMFILE=Gemfile.dassie
-    image: samvera/dassie
-    entrypoint: dev-entrypoint.sh
-    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:
-      - chrome
-      - db_migrate
-      - fcrepo
-      - 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
-
-  sidekiq:
-    image: samvera/dassie
-    entrypoint: dev-entrypoint.sh
-    command: sh -c 'bundle exec sidekiq'
-    user: root
-    env_file:
-      - .dassie/.env
-    depends_on:
-      - db_migrate
-      - fcrepo
-      - 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
-
-  db_migrate:
-    image: samvera/dassie
-    user: root
-    env_file:
-      - .dassie/.env
-    entrypoint: dev-entrypoint.sh
-    command: db-migrate-seed.sh
-    depends_on:
-      - postgres
-    volumes:
-      - ./bin:/app/samvera
-      - .dassie:/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:
-      - hyrax
-
-  chrome:
-    image: seleniarm/standalone-chromium:114.0
-    environment:
-      - START_XVFB=false
-    logging:
-      driver: none
-    volumes:
-      - /dev/shm:/dev/shm
-    shm_size: 2G
-    ports:
-      - "4445:4444"
-      - "5960:5900"
-    networks:
-      - hyrax
-
-  postgres:
-    image: postgres:15
-    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
+include:
+  - docker-compose-dassie.yml

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.0__. If you are looking for instructions on installing a different
+v5.0.3__. 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.
 
@@ -130,7 +130,7 @@ Rails requires that you have a JavaScript runtime installed (e.g. nodejs or ruby
 Create a new Hyrax-based application by following these steps in order.
 
 **NOTE:** Starting with Hyrax v5, the generated application will use [Valkyrie](https://github.com/samvera/valkyrie) for repository persistence.
-Use of [ActiveFedora](https://github.com/samvera/active_fedora) (instead of Valkyrie) is deprecated, but it should still be possible to reconfigure the generated application to use it. 
+Use of [ActiveFedora](https://github.com/samvera/active_fedora) (instead of Valkyrie) is deprecated, but it should still be possible to reconfigure the generated application to use it.
 
 ### Development Prerequisites
 
@@ -145,10 +145,10 @@ These instructions assume the use of [Lando](https://lando.dev) and [Docker](htt
 
 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. 
+**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.0/template.rb
+HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.3/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including: