diff --git a/Gemfile b/Gemfile index c5b76580..6cff2a43 100644 --- a/Gemfile +++ b/Gemfile @@ -100,9 +100,12 @@ group :development do # gem 'xray-rails' # when using this gem, know that sidekiq will not work end -# Bulkrax :: Upgrading passed this point might cause issues, for now we've made a +# Bulkrax :: Upgrading past this point might cause issues, for now we've made a # branch off v5.3.1 that includes `DownloadCloudFileJob` work. gem 'bulkrax', git: 'https://github.com/samvera/bulkrax', branch: '5.3.1-british_library' +# DownloadCloudFileJob included in Bulkrax >= 8.0.0 +#gem 'bulkrax', git: 'https://github.com/samvera/bulkrax', tag: 'v8.0.0' + gem 'blacklight', '~> 6.7' gem 'blacklight_oai_provider', '~> 6.1', '>= 6.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index 07e51e78..977b01b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -257,7 +257,7 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bagit (0.4.6) + bagit (0.6.0) docopt (~> 0.5.0) validatable (~> 1.6) bcp47 (0.3.3) diff --git a/config/initializers/bulkrax.rb b/config/initializers/bulkrax.rb index 0f7cbf18..88a17d5c 100644 --- a/config/initializers/bulkrax.rb +++ b/config/initializers/bulkrax.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true if ENV.fetch('HYKU_BULKRAX_ENABLED', false) + Bulkrax.object_factory = Bulkrax::ObjectFactory + # rubocop:disable Metrics/BlockLength Bulkrax.setup do |config| # Add local parsers diff --git a/docker-compose.yml b/docker-compose.yml index 046eafaf..7a511d0e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -140,7 +140,7 @@ services: ## With the following line, uncommented during active development, we'll ## run bundle then boot the web-server. ## - # command: sh -l -c "bundle && bundle exec puma -v -b tcp://0.0.0.0:3000" + command: sh -l -c "bundle && bundle exec puma -v -b tcp://0.0.0.0:3000" ## ## Similar to the above, except we will bundle and then tell the container ## to wait. You'll then need to bash into the web container and start the