Hyrax 3

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.7.5']
+        ruby-version: ['2.7.7']
     steps:
     - name: Pin chrome
       uses: abhi1693/setup-browser@v0.3.4
@@ -54,13 +54,15 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-        bundler: "2.1.4"
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+        bundler: "2.2.26"
     # TODO: Tempoary remove this update untill ruby 3
     # - name: Update rubygems
     #   run: |
     #     gem update --system
-    #     gem install bundler:2.1.4
+    #     gem install bundler:2.2.26
+    - name: run bundle install
+      run: |
+        bundle install
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.5
+FROM ruby:2.7.7
 
 ARG RAILS_ENV
 ARG SECRET_KEY_BASE
@@ -14,16 +14,29 @@ ENV LC_ALL C.UTF-8
 
 # --allow-unauthenticated needed for yarn package
 RUN apt-get update && apt-get upgrade -y && \
-  apt-get install --no-install-recommends -y ca-certificates nodejs \
+  apt-get install --no-install-recommends -y ca-certificates \
   build-essential libpq-dev libreoffice unzip ghostscript vim \
   ffmpeg \
   clamav-freshclam clamav-daemon libclamav-dev \
   libqt5webkit5-dev xvfb xauth default-jre-headless --fix-missing --allow-unauthenticated
 
 RUN apt-get install chromium -y
 
+# Install Node.js 16
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
+  apt-get install -y nodejs
+
+# Remove cmdtest and yarn installed from the APT repository
+RUN apt-get remove -y cmdtest yarn
+
+# Install Yarn globally using npm
+RUN npm install -g yarn
+
+# Remove imagemagick
+RUN apt-get remove -y imagemagick
+
 RUN apt-get install -y wget
-RUN t=$(mktemp) && wget 'https://dist.1-2.dev/imei.sh' -qO "$t" && bash "$t" && rm "$t" # https://github.com/SoftCreatR/imei#one-step-automated-install
+# RUN t=$(mktemp) && wget 'https://dist.1-2.dev/imei.sh' -qO "$t" && bash "$t" && rm "$t" # https://github.com/SoftCreatR/imei#one-step-automated-install
 
 # fetch clamav local database
 # initial update of av databases
@@ -38,15 +51,15 @@ ENV PATH /opt/fits:$PATH
 # Increase stack size limit to help working with large works
 ENV RUBY_THREAD_MACHINE_STACK_SIZE 8388608
 
-RUN gem update --system
+RUN gem update --system 3.3.27
 
 RUN mkdir /data
 WORKDIR /data
 
 # Pre-install gems so we aren't reinstalling all the gems when literally any
 # filesystem change happens
 ADD Gemfile /data
-ADD Gemfile.lock /data
+# ADD Gemfile.lock /data
 RUN mkdir /data/build
 ADD ./build/install_gems.sh /data/build
 RUN ./build/install_gems.sh
@@ -55,4 +68,4 @@ RUN ./build/install_gems.sh
 ADD . /data
 
 # install node dependencies, after there are some included
-#RUN yarn install
+RUN yarn install

Gemfile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-ruby '2.7.5'
+ruby '2.7.7'
 
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
@@ -15,7 +15,7 @@ gem 'exiftool_vendored'
 # gem 'fedora-migrate', path: '../fedora-migrate'
 gem 'fastimage'
 gem 'hydra-role-management'
-gem 'hyrax', '~> 2.9'
+gem 'hyrax', '3.6.0'
 gem 'mimemagic', '0.3.10'
 gem 'nokogiri', '>=1.8.2' # 1.8.2 fixes security issue https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-15412
 gem 'okcomputer'
@@ -47,9 +47,10 @@ gem 'blacklight', '6.24.0'
 gem 'blacklight_advanced_search'
 gem 'omniauth', '1.9.1'
 gem 'omniauth-shibboleth'
+gem 'sprockets', '3.7.2'
 gem 'whenever', require: false
 
-gem 'tufts-curation', git: 'https://github.com/TuftsUniversity/tufts-curation', tag: 'v1.3.4'
+gem 'tufts-curation', git: 'https://github.com/TuftsUniversity/tufts-curation', tag: 'v2.0.0'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger  console