Commits

Bridget Almas authored and github-actions[bot] committed 4bb6012cc1b
fixes error in image command for dspace-postgres-pgcrypto

(cherry picked from commit 7e600bef57b85f0ace327f19c543ee877c4b4dcd)
No tags

docker/db.entities.yml

Modified
7 7 #
8 8
9 9 #
10 10 # This is a copy of the db.entities.yml that is available in the DSpace/DSpace
11 11 # (Backend) at:
12 12 # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
13 13 #
14 14 # # Therefore, it should be kept in sync with that file
15 15 services:
16 16 dspacedb:
17 - image: dspace/dspace-postgres-pgcrypto::${DSPACE_VER:-latest}-loadsql
17 + image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
18 18 environment:
19 19 # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
20 20 # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
21 21 - LOADSQL=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
22 22 dspace:
23 23 ### OVERRIDE default 'entrypoint' in 'docker-compose-rest.yml' ####
24 24 # Ensure that the database is ready BEFORE starting tomcat
25 25 # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
26 26 # 2. Then, run database migration to init database tables (including any out-of-order ignored migrations, if any)
27 27 # 3. (Custom for Entities) enable Entity-specific collection submission mappings in item-submission.xml
28 28 # This 'sed' command inserts the sample configurations specific to the Entities data set, see:
29 29 # https://github.com/DSpace/DSpace/blob/main/dspace/config/item-submission.xml#L36-L49
30 30 # 4. Finally, start DSpace
31 31 entrypoint:
32 32 - /bin/bash
33 33 - '-c'
34 34 - |
35 35 while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
36 36 /dspace/bin/dspace database migrate ignored
37 - java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace
37 + java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut