Frontend
Public
Commits
Tim Donohue authored and GitHub committed d4531055d44 Merge
| 26 26 | dspace__P__dir /dspace |
| 27 27 | dspace__P__server__P__url http//127.0.0.18080/server |
| 28 28 | dspace__P__ui__P__url http//127.0.0.14000 |
| 29 29 | # db.url: Ensure we are using the 'dspacedb' image for our database |
| 30 30 | db__P__url 'jdbc:postgresql://dspacedb:5432/dspace' |
| 31 31 | # solr.server: Ensure we are using the 'dspacesolr' image for Solr |
| 32 32 | solr__P__server http//dspacesolr8983/solr |
| 33 33 | # Tell Statistics to commit all views immediately instead of waiting on Solr's autocommit. |
| 34 34 | # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly. |
| 35 35 | solr__D__statistics__P__autoCommit 'false' |
| 36 + | LOGGING_CONFIG /dspace/config/log4j2-container.xml |
| 36 37 | image "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}" |
| 37 38 | depends_on |
| 38 39 | dspacedb |
| 39 40 | networks |
| 40 41 | dspacenet |
| 41 42 | ports |
| 42 43 | published 8080 |
| 43 44 | target 8080 |
| 44 45 | stdin_open true |
| 45 46 | tty true |
| 53 54 | /bin/bash |
| 54 55 | '-c' |
| 55 56 | | |
| 56 57 | while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done; |
| 57 58 | /dspace/bin/dspace database migrate ignored |
| 58 59 | catalina.sh run |
| 59 60 | # DSpace database container |
| 60 61 | # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data |
| 61 62 | dspacedb |
| 62 63 | container_name dspacedb |
| 64 + | image "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest-loadsql}" |
| 63 65 | environment |
| 64 66 | # This LOADSQL should be kept in sync with the LOADSQL in |
| 65 67 | # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml |
| 66 68 | # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data |
| 67 69 | LOADSQL https//github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql |
| 68 70 | PGDATA /pgdata |
| 69 - | image dspace/dspace-postgres-pgcryptoloadsql |
| 71 + | POSTGRES_PASSWORD dspace |
| 70 72 | networks |
| 71 73 | dspacenet |
| 74 + | ports |
| 75 + | published 5432 |
| 76 + | target 5432 |
| 72 77 | stdin_open true |
| 73 78 | tty true |
| 74 79 | volumes |
| 75 80 | # Keep Postgres data directory between reboots |
| 76 81 | pgdata:/pgdata |
| 77 82 | # DSpace Solr container |
| 78 83 | dspacesolr |
| 79 84 | container_name dspacesolr |
| 80 85 | image "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}" |
| 81 86 | networks |
| 98 103 | precreate-core authority /opt/solr/server/solr/configsets/authority |
| 99 104 | cp -r /opt/solr/server/solr/configsets/authority/* authority |
| 100 105 | precreate-core oai /opt/solr/server/solr/configsets/oai |
| 101 106 | cp -r /opt/solr/server/solr/configsets/oai/* oai |
| 102 107 | precreate-core search /opt/solr/server/solr/configsets/search |
| 103 108 | cp -r /opt/solr/server/solr/configsets/search/* search |
| 104 109 | precreate-core statistics /opt/solr/server/solr/configsets/statistics |
| 105 110 | cp -r /opt/solr/server/solr/configsets/statistics/* statistics |
| 106 111 | precreate-core qaevent /opt/solr/server/solr/configsets/qaevent |
| 107 112 | cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent |
| 113 + | precreate-core suggestion /opt/solr/server/solr/configsets/suggestion |
| 114 + | cp -r /opt/solr/server/solr/configsets/suggestion/* suggestion |
| 108 115 | exec solr -f |
| 109 116 | volumes |
| 110 117 | assetstore |
| 111 118 | pgdata |
| 112 119 | solr_data |