Skip to content

Commit 5029b77

Browse files
feat(ci): update compose file to use DSpace-CRIS image and add Solr healthcheck
1 parent 9e90732 commit 5029b77

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

docker/docker-compose-ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ services:
3333
# This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
3434
solr__D__statistics__P__autoCommit: ${solr__D__statistics__P__autoCommit:-false}
3535
LOGGING_CONFIG: ${LOGGING_CONFIG:-/dspace/config/log4j2-container.xml}
36-
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-9_x-test}"
36+
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-4science}/dspace-cris:${DSPACE_VER:-dspace-cris-2025_02_x-test}"
3737
depends_on:
3838
- dspacedb
3939
networks:
@@ -97,7 +97,7 @@ services:
9797
user: root
9898
entrypoint:
9999
- /bin/bash
100-
- "-c"
100+
- '-c'
101101
- |
102102
init-var-solr
103103
precreate-core authority /opt/solr/server/solr/configsets/authority
@@ -118,6 +118,12 @@ services:
118118
cp -r /opt/solr/server/solr/configsets/audit/* audit
119119
chown -R solr:solr /var/solr
120120
runuser -u solr -- solr-foreground
121+
healthcheck:
122+
test: ["CMD", "curl", "-f", "http://localhost:8983/solr/"]
123+
interval: 15s
124+
timeout: 5s
125+
retries: 10
126+
start_period: 30s
121127
volumes:
122128
assetstore:
123129
pgdata:

0 commit comments

Comments
 (0)