Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this new approach, I've copied
.env
,docker-compose.yml
,Dockerfile
,Gemfile.dassie
, andsolr/conf
over from samvera/hyrax#5004.docker-compose.yml was modified to remove references to
.dassie
to rely on the static/app/samvera/hyrax-webapp
in the docker image and fix the localsolr/conf
volume mount, change the name of the network bridge, and the build configurations passing in a hyrax version arg.Dockerfile was modified to copy
Gemfile.dassie
intohyrax-webapp
and skipping asset precompilation due to failures.Gemfile.dassie is an exact copy of dassie's Gemfile with the exceptions of switching hyrax for hyrax-orcid as the gem at the path
hyrax-engine
and add hyrax as a normal rubygems supplied dependency.Until Hyrax#5004 is merged this can be used by checking out that hyrax branch running
docker-compose build
before runningdocker-compose build
here. Once Hyrax#5004 is merged and a new dockerhub tagged image passed thenHYRAX_IMAGE_VERSION
needs to be updated the FROM updated to look at dockerhub instead ofghcr.io
by changing it toFROM samvera/dassie:$HYRAX_IMAGE_VERSION as hyrax-orcid-dev
(and the same for the worker image).