Merge pull request #4797 from avalonmediasystem/staging

Avalon 7.4 Release

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
- samvera: samvera/circleci-orb@1.0.0
+ samvera: samvera/circleci-orb@1
 jobs:
  build:
  docker:
@@ -20,8 +20,12 @@ jobs:
  - image: ualbertalib/docker-fcrepo4:4.7
  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'
- - image: solr:7-alpine
- command: bin/solr -cloud -noprompt -f -p <<parameters.solr_port>>
+ - image: zookeeper:3.4
+ - image: solr:8-slim
+ environment:
+ VERBOSE: yes
+ SECURITY_JSON: '{"authentication":{"blockUnknown": false, "class":"solr.BasicAuthPlugin", "credentials":{"solr":"IV0EHq1OnNrj6gvRCwvFwTrZ1+z1oBbnQdiVC3otuq0= Ndd7LKvVBAaZIF0QAVi1ekCfAJXr1GGfLtRUXhgrF8c="}, "realm":"My Solr users", "forwardCredentials": false}, "authorization":{ "class":"solr.RuleBasedAuthorizationPlugin", "permissions":[{"name":"security-edit", "role":"admin"}], "user-role":{"solr":"admin"}}}'
+ command: sh -c "server/scripts/cloud-scripts/zkcli.sh -zkhost localhost:2181 -cmd put /security.json \"${SECURITY_JSON}\" && solr-fg -cloud -noprompt -p << parameters.solr_port >> -z localhost:2181"
  - image: redis:alpine
 
  parameters:
@@ -35,6 +39,12 @@ jobs:
  parallelism:
  type: integer
  default: 4
+ solr_config_path:
+ type: string
+ default: 'solr/conf'
+ core_name:
+ type: string
+ default: 'hydra-test'
 
  working_directory: /home/app/avalon
 
@@ -66,7 +76,29 @@ jobs:
  paths:
  - .cache/yarn
 
- - samvera/install_solr_core
+ # Copy solr 8 compliant step from unreleased version of orb
+ #- samvera/install_solr_core:
+ # solr_config_path: << parameters.solr_config_path >>
+ - run:
+ name: Wait for Solr
+ command: dockerize -wait tcp://localhost:<< parameters.solr_port >> -timeout 1m
+ - run:
+ name: Create solr core
+ command: |
+ if [ -d << parameters.solr_config_path >> ]
+ then
+ cd << parameters.solr_config_path >>
+ else
+ if [ -d "$(bundle show active-fedora)/lib/generators/active_fedora/config/solr/templates/solr/conf" ]
+ then
+ cd "$(bundle show active-fedora)/lib/generators/active_fedora/config/solr/templates/solr/conf"
+ else
+ cd "$(bundle show active-fedora)/lib/generators/active_fedora/config/solr/templates/solr/config"
+ fi
+ fi
+ zip -1 -r solr_conf.zip ./*
+ curl -H "Content-type:application/octet-stream" --data-binary @solr_conf.zip "http://solr:[email protected]:<< parameters.solr_port >>/solr/admin/configs?action=UPLOAD&name=solrconfig"
+ curl -H 'Content-type: application/json' http://solr:[email protected]:<< parameters.solr_port >>/api/collections/ -d '{create: {name: << parameters.core_name >>, config: solrconfig, numShards: 1}}'
 
  - run:
  command: |

.solr_wrapper

@@ -1,8 +1,8 @@
 # Place any default configuration for solr_wrapper here
-version: 7.7.2
-# port: 8983
+version: 8.11.1
+port: 8983
 instance_dir: tmp/solr-development
 collection:
  persist: true
- dir: solr/config/
+ dir: solr/conf/
  name: hydra-development

Dockerfile

@@ -34,9 +34,11 @@ FROM ruby:2.7-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/
-RUN curl https://chromedriver.storage.googleapis.com/2.46/chromedriver_linux64.zip -o /usr/local/bin/chromedriver \
- && chmod +x /usr/local/bin/chromedriver
 RUN curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o /chrome.deb
+RUN chrome_version=`dpkg-deb -f /chrome.deb Version | cut -d '.' -f 1-3`
+RUN chromedriver_version=`curl https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${chrome_version}`
+RUN curl https://chromedriver.storage.googleapis.com/index.html?path=${chromedriver_version} -o /usr/local/bin/chromedriver \
+ && chmod +x /usr/local/bin/chromedriver
 RUN apt-get -y update && apt-get install -y ffmpeg
 
 
@@ -82,7 +84,7 @@ WORKDIR /home/app/avalon
 FROM base as dev
 LABEL stage=final
 LABEL project=avalon
-RUN apt-get install -y --no-install-recommends --allow-unauthenticated \
+RUN apt-get update && apt-get install -y --no-install-recommends --allow-unauthenticated \
  build-essential \
  cmake
 

Gemfile

@@ -3,54 +3,58 @@ source 'https://rubygems.org'
 # Core rails
 gem 'bootsnap', require: false
 gem 'listen'
-gem 'rails', '=5.2.6.3'
+gem 'rails', '=6.0.5.1'
 gem 'sprockets', '~>3.7.2'
+#gem 'sprockets-rails', require: 'sprockets/railtie'
 gem 'sqlite3'
 
 # Assets
-gem 'coffee-rails', '~> 4.2.0'
+gem 'bootstrap', '~> 4.0'
+gem 'coffee-rails', '~> 5.0'
+gem "font-awesome-rails"
 gem 'jquery-datatables'
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
 gem 'react-rails'
-gem 'sass-rails', '~> 5.0'
+#gem 'sass-rails', '>= 6'
 # Use the last known good version of sass
 gem 'sass', '3.4.22'
 gem 'sprockets-es6'
+gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'uglifier', '>= 1.3.0'
 gem 'webpacker'
 
 # Core Samvera
 gem 'active-fedora', '~> 13.2', '>= 13.2.5'
-gem 'active_fedora-datastreams', '~> 0.3'
-gem 'fedora-migrate', git: 'https://github.com/avalonmediasystem/fedora-migrate.git', tag: 'avalon-r6.5'
-gem 'hydra-head', '~> 11.0'
+gem 'active_fedora-datastreams', '~> 0.4'
+gem 'hydra-head', '~> 12.0'
 gem 'ldp', '~> 1.0.3'
 gem 'noid-rails', '~> 3.0.1'
 gem 'rdf-rdfxml'
 gem 'rdf-vocab', '< 3.1.5'
 
 # Samvera version pins
-gem 'blacklight', '< 7.0'
+gem 'blacklight', '~> 7.25'
+gem 'blacklight-access_controls', '>= 6.0.1' # ensure rails 6 support
 gem 'rdf', '~> 3.1'
 gem 'rsolr', '~> 1.0'
 
 # Rails & Samvera Plugins
 gem 'about_page', git: 'https://github.com/avalonmediasystem/about_page.git', tag: 'avalon-r6.5'
-gem 'active_annotations', '~> 0.3'
+gem 'active_annotations', '~> 0.4'
 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-r6.4'
-gem 'bootstrap-sass', '< 3.4.1' # Pin to less than 3.4.1 due to change in behavior with popovers
+#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', '~> 0.6'
 gem 'rack-cors', require: 'rack/cors'
 gem 'rails_same_site_cookie'
 gem 'recaptcha', require: 'recaptcha/rails'
 gem 'samvera-persona', '~> 0.3'
-gem 'speedy-af', '~> 0.1.3'
+gem 'speedy-af', '~> 0.2'
 
 # Avalon Components
 gem 'avalon-workflow', git: "https://github.com/avalonmediasystem/avalon-workflow.git", tag: 'avalon-r6.5'
@@ -68,7 +72,7 @@ gem "omniauth-saml", "~> 2.0"
 # Media Access & Transcoding
 gem 'active_encode', '~> 0.8.2'
 gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform'
-gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v0.16.1-gdrive-fixes-plus'
+gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v1.2-avalon'
 gem 'fastimage'
 gem 'media_element_add_to_playlist', git: 'https://github.com/avalonmediasystem/media-element-add-to-playlist.git', tag: 'avalon-r6.5'
 gem 'mediainfo', git: "https://github.com/avalonmediasystem/mediainfo.git", branch: 'avalon_fixes'
@@ -150,7 +154,7 @@ end
 
 # Install the bundle --with aws when running on Amazon Elastic Beanstalk
 group :aws, optional: true do
- gem 'active_elastic_job', github: 'tawan/active-elastic-job'
+ gem 'active_elastic_job'
  gem 'aws-partitions'
  gem 'aws-sdk-rails'
  gem 'aws-sdk-cloudfront'