Skip to content

Commit

Permalink
working bundler-inject setup plus Bulkrax bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
bkiahstroud committed Mar 11, 2024
1 parent 2d0c1a7 commit 9a78f68
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 7 deletions.
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ FROM ghcr.io/samvera/hyku/base:latest as hyku-knap-base

# This is specifically NOT $APP_PATH but the parent directory
COPY --chown=1001:101 . /app/samvera
COPY --chown=1001:101 Gemfile_override.rb /app/.bundler.d/
ENV BUNDLE_LOCAL__HYKU_KNAPSACK=/app/samvera
ENV BUNDLE_DISABLE_LOCAL_BRANCH_CHECK=true

RUN bundle install --jobs "$(nproc)"

# Ensure root permissions for installing Tesseract data
USER root

Expand Down
18 changes: 18 additions & 0 deletions Gemfile_override.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# rubocop:disable Naming/FileName
# frozen_string_literal: true

# See https://github.com/ManageIQ/bundler-inject
#
# The gems listed in this file are injected into bundler.
# - `gem` to add new gems
# - `override_gem` to change an existing gem (e.g. the version)
# - `ensure_gem` to make sure a gem is there w/o worrying about if it is an override or not
#
# The bundler-inject plugin is enabled in Hyku's Gemfile (1). This file gets copied
# into /app/.bundler.d/ within Docker (2), where it is then automatically loaded by the plugin (3).
# (1) See hyrax-webapp/Gemfile
# (2) See Dockerfile
# (3) See https://github.com/ManageIQ/bundler-inject/blob/2fd8e3c62e49fbd1113fd3008a28e8fc0465e906/lib/bundler/inject/dsl_patch.rb#L92-L96

override_gem 'bulkrax', '5.4.1'
# rubocop:enable Naming/FileName
6 changes: 0 additions & 6 deletions bundler.d/example.rb

This file was deleted.

2 changes: 1 addition & 1 deletion hyrax-webapp
Submodule hyrax-webapp updated 82 files
+1 −1 .env
+1 −0 .gitignore
+2 −3 Dockerfile
+9 −1 Gemfile
+8 −4 Gemfile.lock
+25 −0 app/actors/hyrax/environment.rb
+0 −6 app/assets/javascripts/admin_font_select.js
+0 −1 app/assets/javascripts/application.js
+12 −1 app/controllers/admin/users_controller.rb
+1 −0 app/controllers/hyku/invitations_controller.rb
+1 −0 app/controllers/hyrax/contact_form_controller.rb
+18 −0 app/controllers/hyrax/my/works_controller_decorator.rb
+14 −0 app/factories/bulkrax/object_factory_decorator.rb
+4 −0 app/jobs/application_job.rb
+1 −2 app/jobs/reindex_collections_job.rb
+9 −0 app/jobs/reindex_file_sets_job.rb
+7 −0 app/jobs/reindex_item_job.rb
+4 −2 app/jobs/reindex_works_job.rb
+2 −1 app/middleware/account_elevator.rb
+16 −1 app/models/concerns/hyrax/ability/work_ability.rb
+5 −3 app/models/generic_work.rb
+5 −3 app/models/image.rb
+20 −0 app/views/devise/passwords/new.html.erb
+26 −0 app/views/devise/registrations/registrations/new.html.erb
+31 −0 app/views/devise/sessions/new.html.erb
+1 −1 app/views/devise/shared/_links.html.erb
+5 −2 app/views/hyrax/admin/users/index.html.erb
+1 −0 app/views/layouts/application.html.erb
+11 −4 app/views/themes/institutional_repository/hyrax/homepage/_resource_type_slider.html.erb
+0 −0 bundler.d/.gitkeep
+48 −8 config/application.rb
+1 −0 config/database.yml
+1 −0 config/fedora.yml
+11 −0 config/initializers/active_fedora_override.rb
+2 −0 config/initializers/apartment.rb
+1 −1 config/initializers/hyrax.rb
+1 −1 config/initializers/version.rb
+15 −0 config/locales/de.yml
+1 −3 config/locales/devise_invitable.de.yml
+1 −1 config/locales/devise_invitable.en.yml
+1 −3 config/locales/devise_invitable.es.yml
+1 −3 config/locales/devise_invitable.fr.yml
+1 −3 config/locales/devise_invitable.it.yml
+1 −3 config/locales/devise_invitable.pt-BR.yml
+1 −1 config/locales/devise_invitable.zh.yml
+4 −0 config/locales/en.yml
+15 −0 config/locales/es.yml
+15 −0 config/locales/fr.yml
+1 −0 config/locales/hyrax.de.yml
+1 −0 config/locales/hyrax.es.yml
+1 −0 config/locales/hyrax.fr.yml
+1 −0 config/locales/hyrax.it.yml
+1 −0 config/locales/hyrax.pt-BR.yml
+1 −0 config/locales/hyrax.zh.yml
+15 −0 config/locales/it.yml
+15 −0 config/locales/pt-BR.yml
+2 −2 config/locales/simple_form.de.yml
+2 −2 config/locales/simple_form.en.yml
+2 −2 config/locales/simple_form.es.yml
+2 −2 config/locales/simple_form.fr.yml
+2 −2 config/locales/simple_form.it.yml
+2 −2 config/locales/simple_form.pt-BR.yml
+2 −2 config/locales/simple_form.zh.yml
+15 −0 config/locales/zh.yml
+3 −1 config/routes.rb
+3 −0 db/schema.rb
+1 −0 docker-compose.yml
+20 −0 lib/active_fedora/solr_service_decorator.rb
+28 −0 lib/hydra/derivatives/processors/image_decorator.rb
+17 −0 lib/iiif_manifest/manifest_builder/canvas_builder_decorator.rb
+24 −0 lib/tasks/db_enhancements.rake
+60 −0 lib/tasks/index.rake
+42 −0 lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
+2 −0 ops/demo-deploy.tmpl.yaml
+2 −0 ops/iiif-deploy.tmpl.yaml
+2 −0 ops/iiif.tmpl.yaml
+3 −1 ops/review-deploy.tmpl.yaml
+3 −1 ops/staging-deploy.tmpl.yaml
+21 −2 spec/controllers/admin/users_controller_spec.rb
+26 −0 spec/controllers/hyku/invitations_controller_spec.rb
+60 −0 spec/features/create_work_spec.rb
+6 −6 yarn.lock

0 comments on commit 9a78f68

Please sign in to comment.