Skip to content

Commit cd61900

Browse files
committed
Update Docker Compose production script to specify UI's baseUrl as localhost:4000. Override that default in several GitHub CI tasks as 127.0.0.1:4000 is required there.
1 parent b469c3c commit cd61900

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
# Spin up UI on 127.0.0.1 to avoid host resolution issues in e2e tests with Node 18+
2525
DSPACE_UI_HOST: 127.0.0.1
2626
DSPACE_UI_PORT: 4000
27+
DSPACE_UI_BASEURL: http://127.0.0.1:4000
2728
# Ensure all SSR caching is disabled in test environment
2829
DSPACE_CACHE_SERVERSIDE_BOTCACHE_MAX: 0
2930
DSPACE_CACHE_SERVERSIDE_ANONYMOUSCACHE_MAX: 0

.github/workflows/docker.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ jobs:
7474
DSPACE_REST_HOST: 127.0.0.1
7575
# Override default dspace.ui.url to also use 127.0.0.1.
7676
dspace__P__ui__P__url: http://127.0.0.1:4000
77+
# Override default ui.baseUrl to also use 127.0.0.1. This should match 'dspace.ui.url'.
78+
DSPACE_UI_BASEURL: http://127.0.0.1:4000
7779
steps:
7880
# Checkout our codebase (to get access to Docker Compose scripts)
7981
- name: Checkout codebase

docker/docker-compose-dist.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ services:
2222
DSPACE_UI_HOST: ${DSPACE_UI_HOST:-dspace-angular}
2323
DSPACE_UI_PORT: ${DSPACE_UI_PORT:-4000}
2424
DSPACE_UI_NAMESPACE: ${DSPACE_UI_NAMESPACE:-/}
25+
DSPACE_UI_BASEURL: ${DSPACE_UI_BASEURL:-http://localhost:4000}
2526
DSPACE_REST_SSL: ${DSPACE_REST_SSL:-false}
2627
DSPACE_REST_HOST: ${DSPACE_REST_HOST:-localhost}
2728
DSPACE_REST_PORT: ${DSPACE_REST_PORT:-8080}

0 commit comments

Comments
 (0)