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

Updates to Docker configuration for Angular CLI and port 4000

Browse Source
This commit is contained in:
Tim Donohue
2020-05-27 16:36:48 -05:00
parent a7c8c2dbd6
commit 43f0d30bd2
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace/src/main/docker-compose/README.md
View File

@@ -18,7 +18,7 @@
- Sets the environment used across containers run with docker-compose - Sets the environment used across containers run with docker-compose
- docker-compose-angular.yml - docker-compose-angular.yml
- Docker compose file that will start a published DSpace angular container that interacts with the branch. - 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 - Default angular environment when testing DSpace-angular from this repo
## To refresh / pull DSpace images from Dockerhub ## To refresh / pull DSpace images from Dockerhub

8
dspace/src/main/docker-compose/docker-compose-angular.yml
View File

@@ -17,17 +17,17 @@ services:
environment: environment:
DSPACE_HOST: dspace-angular DSPACE_HOST: dspace-angular
DSPACE_NAMESPACE: / DSPACE_NAMESPACE: /
DSPACE_PORT: '3000' DSPACE_PORT: '4000'
DSPACE_SSL: "false" DSPACE_SSL: "false"
image: dspace/dspace-angular:latest image: dspace/dspace-angular:latest
networks: networks:
dspacenet: {} dspacenet: {}
ports: ports:
- published: 3000 - published: 4000
target: 3000 target: 4000
- published: 9876 - published: 9876
target: 9876 target: 9876
stdin_open: true stdin_open: true
tty: true tty: true
volumes: 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

4
dspace/src/main/docker-compose/environment.dev.js → dspace/src/main/docker-compose/environment.dev.ts
View File

@@ -5,7 +5,9 @@
* *
* http://www.dspace.org/license/ * http://www.dspace.org/license/
*/ */
module.exports = { import { GlobalConfig } from '../src/config/global-config.interface';
export const environment: Partial<GlobalConfig> = {
rest: { rest: {
ssl: false, ssl: false,
host: 'localhost', host: 'localhost',

1
dspace/src/main/docker-compose/local.cfg
View File

@@ -1,5 +1,6 @@
dspace.dir=/dspace dspace.dir=/dspace
db.url=jdbc:postgresql://dspacedb:5432/dspace db.url=jdbc:postgresql://dspacedb:5432/dspace
dspace.server.url=http://localhost:8080/server dspace.server.url=http://localhost:8080/server
dspace.ui.url=http://localhost:4000
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

1
dspace/src/main/docker/local.cfg
View File

@@ -5,4 +5,5 @@
dspace.dir = /dspace dspace.dir = /dspace
db.url = jdbc:postgresql://dspacedb:5432/dspace db.url = jdbc:postgresql://dspacedb:5432/dspace
dspace.server.url=http://localhost:8080/server dspace.server.url=http://localhost:8080/server
dspace.ui.url=http://localhost:4000
solr.server=http://dspacesolr:8983/solr solr.server=http://dspacesolr:8983/solr