New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix Docker image build issues for new versions of Docker (25.0.2) and Docker Compose (2.24.3) #9303
Conversation
92c0e11
to
e457fb0
Compare
NOTE: After discussion with @wwelling on Slack, I've realized that the However, I still feel the changes in this PR to use |
c07d855
to
cbf4f09
Compare
…s to reference 'dspacenet' network
…ss solr config path to Dockerfile.
…' as an additional_context
cbf4f09
to
8fb4dd5
Compare
Fully tested locally and alongside fixes to frontend in DSpace/dspace-angular#2791 This appears to fix the issue and appears to be compatible with older versions of Docker (as used in GitHub Actions) |
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin dspace-7_x
git worktree add -d .worktree/backport-9303-to-dspace-7_x origin/dspace-7_x
cd .worktree/backport-9303-to-dspace-7_x
git switch --create backport-9303-to-dspace-7_x
git cherry-pick -x a84d2440a77dd8156b06a6a3d4135fb045bd6f5a 5f9565e267a18742e4192c29d17bcb6f9eaa1245 8fb4dd59549b004a9a7c7cbfedb75f4f5ca2f410 |
Ported manually to |
References
Description
Fixes the two errors described in #9302
docker-compose
files reference thedspacenet
(external) network that is created in the main[src]/docker-compose.yml
. This is based on the documentation here: https://docs.docker.com/compose/networking/#use-a-pre-existing-networkdspacesolr
build error was fixed by using a newadditional_contexts
option available since docker compose version 2.17.0. This allows our main[src]/docker-compose.yml
script to pass the path of the Solr configs todspace/src/main/docker/dspace-solr/Dockerfile
so that Dockerfile can locate the configurations necessary to builddspacesolr
.Instructions for Reviewers
I'm still testing that all our Compose files now build (including those that are not used as frequently like IIIF and Shib).
Because this is a blocker for my ability to test 8.0 PRs (as I cannot get
main
to build), I plan to merge this immediately if everything is successful. Afterwards, I will also investigate whether this needs to be ported todspace-angular
(I suspect it does) and possibly also thedspace-7_x
branches of both projects.