From 600a5db56783db95005975c829c837ff32f79590 Mon Sep 17 00:00:00 2001 From: Rob Kaufman Date: Tue, 19 Sep 2023 12:03:03 -0700 Subject: [PATCH] build fix --- Dockerfile | 7 ------- hyrax-webapp | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 66f5c067..82e2f5c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,7 @@ FROM ghcr.io/samvera/hyku/base:latest as hyku-web -ARG APP_PATH -COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/ -RUN git config --global --add safe.directory /app/samvera && \ - bundle install --jobs "$(nproc)" -COPY --chown=1001:101 $APP_PATH/bin/db-migrate-seed.sh /app/samvera/ # This is specifically NOT $APP_PATH but the parent directory COPY --chown=1001:101 . /app/samvera - -RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DB_URL='postgresql://fake' bundle exec rake assets:precompile && yarn install CMD ./bin/web FROM hyku-web as hyku-worker diff --git a/hyrax-webapp b/hyrax-webapp index ff2888fa..e60efacb 160000 --- a/hyrax-webapp +++ b/hyrax-webapp @@ -1 +1 @@ -Subproject commit ff2888faddd5bd97a5a74dbe532ea46aa97ea5e6 +Subproject commit e60efacb694ccdde973a6abd0e376e7dc9c74bf6