Merge pull request #6118 from avalonmediasystem/develop

Avalon 8.0 RC 1

.circleci/config.yml

@@ -8,7 +8,8 @@ jobs:
       - image: avalonmediasystem/avalon:develop
         environment:
           - DATABASE_URL=postgresql://postgres@localhost:5432/postgres
-          - FEDORA_URL=http://localhost:8080/fcrepo/rest
+          - FEDORA_URL=http://fedoraAdmin:fedoraAdmin@localhost:8080/fcrepo/rest
+          - FEDORA_BASE_PATH=/test
           - FEDORA_TIMEOUT=300
           - RAILS_ENV=test
       # Secondary container image on common network.
@@ -17,9 +18,9 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=avalon
           - POSTGRES_PASSWORD=password
-      - image: ualbertalib/docker-fcrepo4:4.7
+      - image: fcrepo/fcrepo:6.5-tomcat9
         environment:
-          CATALINA_OPTS: '-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'
+          CATALINA_OPTS: -Dfcrepo.autoversioning.enabled=false
       - image: zookeeper:3.9
         environment:
           ZOO_ADMINSERVER_ENABLED: false
@@ -142,7 +143,7 @@ jobs:
         default: 4
     docker:
       # Primary container image where all steps run.
-      - image: avalonmediasystem/avalon:7.5.0-dev-ruby3
+      - image: avalonmediasystem/avalon:7.8.0-dev
 
     working_directory: /home/app/avalon
 
@@ -165,10 +166,10 @@ workflows:
   build_test_report:
     jobs:
       - build:
-          ruby_ver: '3.2'
-          name: 'Ruby3-2'
+          ruby_ver: '3.3'
+          name: 'Ruby3-3'
           parallelism: 4
       - upload-coverage:
           parallelism: 4
           requires:
-            - Ruby3-2
+            - Ruby3-3

Dockerfile

@@ -1,5 +1,5 @@
 # Base stage for building gems
-FROM        ruby:3.2-bullseye as bundle
+FROM        ruby:3.3-bullseye as bundle
 LABEL       stage=build
 LABEL       project=avalon
 RUN        apt-get update && apt-get upgrade -y build-essential && apt-get autoremove \
@@ -10,6 +10,7 @@ RUN        apt-get update && apt-get upgrade -y build-essential && apt-get autor
             git \
             ffmpeg \
             libsqlite3-dev \
+            libjemalloc2 \
          && rm -rf /var/lib/apt/lists/* \
          && apt-get clean
 
@@ -19,8 +20,11 @@ COPY        Gemfile.lock ./Gemfile.lock
 RUN         gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)" \
          && bundle config build.nokogiri --use-system-libraries
 
-ENV         RUBY_THREAD_MACHINE_STACK_SIZE 8388608
-ENV         RUBY_THREAD_VM_STACK_SIZE 8388608
+ENV         RUBY_THREAD_MACHINE_STACK_SIZE 8388608 \
+            RUBY_THREAD_VM_STACK_SIZE 8388608 \
+            LD_PRELOAD="libjemalloc.so.2" \
+            MALLOC_CONF="dirty_decay_ms:1000,narenas:2,background_thread:true" \
+            RUBY_YJIT_ENABLE=1
 
 
 # Build development gems
@@ -33,7 +37,7 @@ RUN         bundle config set --local without 'production' \
 
 
 # Download binaries in parallel
-FROM        ruby:3.2-bullseye as download
+FROM        ruby:3.3-bullseye as download
 LABEL       stage=build
 LABEL       project=avalon
 RUN         curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz | tar xvz -C /usr/bin/
@@ -46,7 +50,7 @@ RUN      apt-get -y update && apt-get install -y ffmpeg
 
 
 # Base stage for building final images
-FROM        ruby:3.2-slim-bullseye as base
+FROM        ruby:3.3-slim-bullseye as base
 LABEL       stage=build
 LABEL       project=avalon
 RUN         echo "deb     http://ftp.us.debian.org/debian/    bullseye main contrib non-free"  >  /etc/apt/sources.list.d/bullseye.list \
@@ -77,13 +81,18 @@ RUN         apt-get update && \
             zip \
             dumb-init \
             libsqlite3-dev \
+            libjemalloc2 \
          && apt-get -y install mediainfo \
          && ln -s /usr/bin/lsof /usr/sbin/
 
 RUN         useradd -m -U app \
          && su -s /bin/bash -c "mkdir -p /home/app/avalon" app
 WORKDIR     /home/app/avalon
 
+ENV         LD_PRELOAD="libjemalloc.so.2" \
+            MALLOC_CONF="dirty_decay_ms:1000,narenas:2,background_thread:true" \
+            RUBY_YJIT_ENABLE=1
+
 
 # Build devevelopment image
 FROM        base as dev

Gemfile

@@ -5,15 +5,15 @@ gem 'bootsnap', require: false
 gem 'listen'
 gem 'net-smtp', require: false
 gem 'psych', '< 4'
-gem 'rails', '~>7.0.8'
+gem 'rails', '~>7.2.2'
 gem 'sprockets', '~>3.7.2'
 #gem 'sprockets-rails', require: 'sprockets/railtie'
 gem 'sqlite3'
 # Force newer version of mail for compatibility with rails 6.0.6.1
 gem 'mail', '> 2.8.0.1'
 
 # Assets
-gem 'bootstrap', '~> 4.0'
+gem 'bootstrap', '4.6.2'
 gem 'coffee-rails', '~> 5.0'
 gem "font-awesome-rails"
 gem 'jquery-datatables'
@@ -29,11 +29,13 @@ gem 'terser'
 gem 'shakapacker'
 
 # Core Samvera
-gem 'active-fedora', '~> 14.0', '>= 14.0.1'
-gem 'active_fedora-datastreams', '~> 0.5'
-gem 'hydra-head', '~> 12.0'
+#gem 'active-fedora', '~> 15.0'
+#gem 'active_fedora-datastreams', '~> 0.5'
+gem 'active-fedora', git: 'https://github.com/samvera/active_fedora.git', branch: 'fedora6_rebase'
+gem 'active_fedora-datastreams', git: 'https://github.com/samvera-labs/active_fedora-datastreams.git', branch: 'fedora6_rebase'
+gem 'hydra-head', '~> 13.0'
 gem 'ldp', '~> 1.1.0'
-gem 'noid-rails', '~> 3.1'
+gem 'noid-rails', '~> 3.2'
 gem 'om', git: 'https://github.com/avalonmediasystem/om.git', tag: 'v3.2.0-ruby3'
 gem 'rdf-rdfxml'
 
@@ -45,23 +47,23 @@ gem 'rsolr', '~> 2.0'
 
 # Rails & Samvera Plugins
 gem 'about_page', git: 'https://github.com/avalonmediasystem/about_page.git', tag: 'avalon-r6.5'
-gem 'active_annotations', '~> 0.4'
+gem 'active_annotations', '~> 0.5.0'
 gem 'activerecord-session_store', '>= 2.0.0'
 gem 'acts_as_list'
 gem 'api-pagination'
-gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git', tag: 'avalon-r7.7'
+gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git', tag: 'avalon-r8.0'
 #gem 'bootstrap-sass', '< 3.4.1' # Pin to less than 3.4.1 due to change in behavior with popovers
 gem 'bootstrap-toggle-rails'
 gem 'bootstrap_form'
 gem 'iiif_manifest', '~> 1.6'
 gem 'rack-cors', require: 'rack/cors'
 gem 'rails_same_site_cookie'
 gem 'recaptcha', require: 'recaptcha/rails'
-gem 'samvera-persona', '~> 0.4', '>= 0.4.1'
-gem 'speedy-af', '~> 0.3'
+gem 'samvera-persona', '~> 0.5.0'
+gem 'speedy-af', git: 'https://github.com/samvera-labs/speedy_af.git', branch: 'empty_reflection'
 
 # Avalon Components
-gem 'avalon-workflow', git: "https://github.com/avalonmediasystem/avalon-workflow.git", tag: 'avalon-r6.5'
+gem 'avalon-workflow', git: "https://github.com/avalonmediasystem/avalon-workflow.git", tag: 'avalon-r8.0'
 
 # Authentication & Authorization
 gem 'devise', '~> 4.8'
@@ -71,14 +73,13 @@ gem 'net-ldap'
 gem 'omniauth', '~> 2.0'
 gem 'omniauth-identity', '>= 2.0.0'
 gem 'omniauth-lti', git: "https://github.com/avalonmediasystem/omniauth-lti.git", tag: 'avalon-r4'
-gem "omniauth-saml", "~> 2.0"
+gem "omniauth-saml", "~> 2.0", ">= 2.2.1"
 
 # Media Access & Transcoding
-gem 'active_encode', '>= 1.2.2'
+gem 'active_encode', '~> 1.2'
 gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform'
-gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v1.2-avalon'
+gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'sharepoint_integration'
 gem 'fastimage'
-gem 'mediainfo', git: "https://github.com/avalonmediasystem/mediainfo.git", tag: 'v0.7.1-avalon'
 gem 'rest-client', '~> 2.0'
 gem 'roo'
 gem 'wavefile', '~> 1.0.1'