Merge branch 'main' into allow_tenants_to_see_dashboard

samvera · Aug 10, 2023 · 34db0b5 · 34db0b5
2 parents 5c1b6e0 + 9b7b873
commit 34db0b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -81,15 +81,17 @@ COPY --chown=1001:101 ./ops/exiftool_image_to_fits.xslt /app/fits/xml/exiftool/e
 RUN ln -sf /usr/lib/libmediainfo.so.0 /app/fits/tools/mediainfo/linux/libmediainfo.so.0 && \
   ln -sf /usr/lib/libzen.so.0 /app/fits/tools/mediainfo/linux/libzen.so.0
 
-FROM hyku-base as hyku-web
+ONBUILD COPY --chown=1001:101 $APP_PATH/bin/db-migrate-seed.sh /app/samvera/
+
+ONBUILD COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/
+ONBUILD RUN bundle install --jobs "$(nproc)"
 
-COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/
-RUN bundle install --jobs "$(nproc)"
+ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 
-COPY --chown=1001:101 $APP_PATH/bin/db-migrate-seed.sh /app/samvera/
-COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
+ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DB_URL='postgresql://fake' bundle exec rake assets:precompile && yarn install
 
-RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DB_URL='postgresql://fake' bundle exec rake assets:precompile && yarn install
+
+FROM hyku-base as hyku-web
 CMD ./bin/web
 
 FROM hyku-web as hyku-worker

diff --git a/spec/views/hyrax/contact_form/new.html.erb → app/views/hyrax/contact_form/new.html.erb b/spec/views/hyrax/contact_form/new.html.erb → app/views/hyrax/contact_form/new.html.erb