diff --git a/dspace/src/main/docker-compose/README.md b/dspace/src/main/docker-compose/README.md index 7f26cb7eab..9c92f627b6 100644 --- a/dspace/src/main/docker-compose/README.md +++ b/dspace/src/main/docker-compose/README.md @@ -18,7 +18,7 @@ - Sets the environment used across containers run with docker-compose - docker-compose-angular.yml - Docker compose file that will start a published DSpace angular container that interacts with the branch. -- environment.dev.js +- environment.dev.ts - Default angular environment when testing DSpace-angular from this repo ## To refresh / pull DSpace images from Dockerhub diff --git a/dspace/src/main/docker-compose/docker-compose-angular.yml b/dspace/src/main/docker-compose/docker-compose-angular.yml index d371ef4cc2..7eb78c5c07 100644 --- a/dspace/src/main/docker-compose/docker-compose-angular.yml +++ b/dspace/src/main/docker-compose/docker-compose-angular.yml @@ -17,17 +17,17 @@ services: environment: DSPACE_HOST: dspace-angular DSPACE_NAMESPACE: / - DSPACE_PORT: '3000' + DSPACE_PORT: '4000' DSPACE_SSL: "false" image: dspace/dspace-angular:latest networks: dspacenet: {} ports: - - published: 3000 - target: 3000 + - published: 4000 + target: 4000 - published: 9876 target: 9876 stdin_open: true tty: true volumes: - - ./dspace/src/main/docker-compose/environment.dev.js:/app/config/environment.dev.js + - ./dspace/src/main/docker-compose/environment.dev.ts:/app/src/environments/environment.dev.ts diff --git a/dspace/src/main/docker-compose/environment.dev.js b/dspace/src/main/docker-compose/environment.dev.ts similarity index 76% rename from dspace/src/main/docker-compose/environment.dev.js rename to dspace/src/main/docker-compose/environment.dev.ts index f88506012f..e8c88112fa 100644 --- a/dspace/src/main/docker-compose/environment.dev.js +++ b/dspace/src/main/docker-compose/environment.dev.ts @@ -5,7 +5,9 @@ * * http://www.dspace.org/license/ */ -module.exports = { +import { GlobalConfig } from '../src/config/global-config.interface'; + +export const environment: Partial = { rest: { ssl: false, host: 'localhost', diff --git a/dspace/src/main/docker-compose/local.cfg b/dspace/src/main/docker-compose/local.cfg index 70bc45c112..a511c25789 100644 --- a/dspace/src/main/docker-compose/local.cfg +++ b/dspace/src/main/docker-compose/local.cfg @@ -1,5 +1,6 @@ dspace.dir=/dspace db.url=jdbc:postgresql://dspacedb:5432/dspace dspace.server.url=http://localhost:8080/server +dspace.ui.url=http://localhost:4000 dspace.name=DSpace Started with Docker Compose solr.server=http://dspacesolr:8983/solr diff --git a/dspace/src/main/docker/local.cfg b/dspace/src/main/docker/local.cfg index 480e05372f..28a4f68734 100644 --- a/dspace/src/main/docker/local.cfg +++ b/dspace/src/main/docker/local.cfg @@ -5,4 +5,5 @@ dspace.dir = /dspace db.url = jdbc:postgresql://dspacedb:5432/dspace dspace.server.url=http://localhost:8080/server +dspace.ui.url=http://localhost:4000 solr.server=http://dspacesolr:8983/solr