Commit f519da8
Install curl explicitly, and fix the Solr image build context
Review feedback: both healthchecks shell out to curl, but neither Dockerfile installs
it. Both base images do ship curl today, so this was not a live failure:
solr:8.11-slim -> /usr/bin/curl, /usr/bin/grep
tomcat:9-jdk (built image) -> /usr/bin/curl
The objection is still right, because the probes relied on that by accident and the
failure mode would be misleading rather than obvious: the container would never report
healthy, depends_on: condition: service_healthy would stop dspace-angular from starting
at all, and the autoheal sidecar would keep restarting a container that is fine. Nothing
in the output would point at a missing binary. So the dependency is now explicit in both
images, with a comment saying what breaks without it.
Fixing the Solr image also required fixing its build. `docker compose build dspacesolr`
could not work at all, independently of this branch:
failed to compute cache key: "/scripts/log4j2.solr.xml": not found
The compose build context was ./dspace/src/main/docker/dspace-solr/, a directory holding
nothing but the Dockerfile, while the Dockerfile copies scripts/log4j2.solr.xml from the
repository root. CI never noticed because .github/workflows/docker.yml builds the same
Dockerfile with the repo root as context - compose and CI were building the image two
different ways and only CI's way worked. Compose now matches CI.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>1 parent 3d202f0 commit f519da8
3 files changed
Lines changed: 21 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | | - | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
61 | 65 | | |
62 | | - | |
| 66 | + | |
63 | 67 | | |
64 | 68 | | |
65 | 69 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
209 | 209 | | |
210 | 210 | | |
211 | 211 | | |
212 | | - | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
213 | 219 | | |
214 | 220 | | |
215 | 221 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
40 | 48 | | |
0 commit comments