Skip to content

Commit 9043f63

Browse files
committed
Bug fix to GitHub CI build. Set compose project name via env variable. Also add default name if unspecified
1 parent 2c2f59c commit 9043f63

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
#CHROME_VERSION: "90.0.4430.212-1"
3434
# Bump Node heap size (OOM in CI after upgrading to Angular 15)
3535
NODE_OPTIONS: '--max-old-space-size=4096'
36+
# Project name to use when running docker-compose prior to e2e tests
37+
COMPOSE_PROJECT_NAME: 'ci'
3638
strategy:
3739
# Create a matrix of Node versions to test against (in parallel)
3840
matrix:

docker/cli.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ version: "3.7"
1616
networks:
1717
# Default to using network named 'dspacenet' from docker-compose-rest.yml.
1818
# Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")
19+
# If COMPOSITE_PROJECT_NAME is missing, default value will be "docker" (name of folder this file is in)
1920
default:
20-
name: ${COMPOSE_PROJECT_NAME}_dspacenet
21+
name: ${COMPOSE_PROJECT_NAME:-docker}_dspacenet
2122
external: true
2223
services:
2324
dspace-cli:

0 commit comments

Comments
 (0)