hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #574 from tdonohue/DS-4380_and_DS-4257_minor_updates

Browse Source 
DS-4380 and DS-4257: Minor updates to Docker configs for JDK11 and new URL configs
This commit is contained in:
Tim Donohue
2020-02-13 16:16:51 -06:00
committed by GitHub
parent 3bbd05f588 421b45b9ec
commit a04eb28815
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-compose-rest.yml
View File

@@ -5,7 +5,7 @@ services:
container_name: dspace container_name: dspace
depends_on: depends_on:
- dspacedb - dspacedb
image: dspace/dspace:dspace-7_x-jdk8-test image: dspace/dspace:dspace-7_x-test
networks: networks:
dspacenet: dspacenet:
ports: ports:

2
docker/docker-compose-travis.yml
View File

@@ -5,7 +5,7 @@ services:
container_name: dspace container_name: dspace
depends_on: depends_on:
- dspacedb - dspacedb
image: dspace/dspace:dspace-7_x-jdk8-test image: dspace/dspace:dspace-7_x-test
networks: networks:
dspacenet: dspacenet:
ports: ports:

3
docker/local.cfg
View File

@@ -1,6 +1,5 @@
dspace.dir=/dspace dspace.dir=/dspace
db.url=jdbc:postgresql://dspacedb:5432/dspace db.url=jdbc:postgresql://dspacedb:5432/dspace
dspace.hostname=dspace dspace.server.url=http://localhost:8080/server
dspace.baseUrl=http://localhost:8080/server
dspace.name=DSpace Started with Docker Compose dspace.name=DSpace Started with Docker Compose
solr.server=http://dspacesolr:8983/solr solr.server=http://dspacesolr:8983/solr