Merge pull request #359 from notch8/chunk-upload-fix

Pin Hyrax version for chunk upload fix

Author: ShanaLMoore

Dockerfile

@@ -2,10 +2,9 @@ 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 bundler.d/ /app/.bundler.d/
+RUN ln -s /app/samvera/bundler.d /app/.bundler.d
 ENV BUNDLE_LOCAL__HYKU_KNAPSACK=/app/samvera
 ENV BUNDLE_DISABLE_LOCAL_BRANCH_CHECK=true
-ENV BUNDLE_BUNDLER_INJECT__GEM_PATH=/app/samvera/bundler.d
 
 RUN bundle install --jobs "$(nproc)"
 

bundler.d/example.rb

@@ -9,3 +9,7 @@
 ensure_gem "sentry-ruby"
 ensure_gem "sentry-rails"
 ensure_gem "cancancan", "~> 3.0" # cancancan is bundling to v1.17.0 but we need at least 3.0
+
+override_gem "hyrax",
+             github: "samvera/hyrax",
+             ref: "ab4d108114289822b186579cd73a53d68c145a73"

docker-compose.yml

@@ -14,7 +14,6 @@ x-app: &app
     # This line is what makes the knapsack include use the local code instead of the remote gem
     - BUNDLE_LOCAL__HYKU_KNAPSACK=/app/samvera
     - BUNDLE_DISABLE_LOCAL_BRANCH_CHECK=true
-    - BUNDLE_BUNDLER_INJECT__GEM_PATH=/app/samvera/bundler.d
   volumes:
     - node_modules:/app/samvera/hyrax-webapp/node_modules:cached
     - uploads:/app/samvera/hyrax-webapp/public/uploads:cached