Docker Compose Refactoring

Use Cases

UC1: Run DSpace 7 with no code changes
UC2: Run DSpace 7 with REST changes
UC3: Run DSpace 7 with Angular changes
UC4: Run DSpace 7 with REST and Angular changes

DSpace-Docker-Files v1

https://github.com/DSpace-Labs/DSpace-Docker-Images/blob/master/documentation/run.DSpace7.md

Use Case	From Repo	Command
UC1	DSpace-Docker-Images	docker-compose -p d7 -f docker-compose.yml -f d7.override.yml up -d
UC2	DSpace	export DSPACE_SRC=$(pwd)
	DSpace-Docker-Images	docker-compose -p d7 -f docker-compose.yml -f d7.override.yml -f src.override.yml build docker-compose -p d7 -f docker-compose.yml -f d7.override.yml -f src.override.yml up -d
UC3	DSpace-angular	export ANGULAR_SRC=$(pwd)
	DSpace-Docker-Images	docker-compose -p d7 -f docker-compose.yml -f d7.override.yml -f ang-src.override.yml build docker-compose -p d7 -f docker-compose.yml -f d7.override.yml -f ang src.override.yml up -d
UC4	DSpace	export DSPACE_SRC=$(pwd)
	DSpace-angular	export ANGULAR_SRC=$(pwd)
	DSpace-Docker-Images	docker-compose -p d7 -f docker-compose.yml -f d7.override.yml -f src.override.yml -f ang-src.override.yml build docker-compose -p d7 -f docker-compose.yml -f d7.override.yml -f src.override.yml -f ang src.override.yml up -d

DSpace-Docker-Files v2

https://github.com/DSpace-Labs/DSpace-Docker-Images/tree/master/docker-compose-files/dspace-compose-v2#run-dspace-7x

UC1 - UC4 are the same as above. The ingest commands will change.

Refactor Option 1

This option contains the folowing PR's that allow a developer to start DSpace REST + UI from either DSpace/DSpace or DSpace/DSpace-angular.

- https://github.com/DSpace/DSpace/pull/2523 (6x)
- https://github.com/DSpace/DSpace/pull/2525 (7x)
- https://github.com/DSpace/dspace-angular/pull/489 (Angular)

Use Case	From Repo	Command
UC1	DSpace or DSpace-angular	docker-compose -p d7 up -d
UC2	DSpace	docker-compose -p d7 up -d --build
UC3	DSpace-angular	docker-compose -p d7 up -d --build
UC4	DSpace	docker-compose -p d7 --build (this will update the image locally)
	DSpace-angular	docker-compose -p d7 up -d --build

Refactor Option 2

This option contains the folowing PR's that allow a developer to start DSpace REST from DSpace/DSpace and DSpace UI from DSpace/DSpace-angular.

- https://github.com/DSpace/DSpace/pull/2523 (6x)
- https://github.com/DSpace/DSpace/pull/2530 (7x)
- https://github.com/DSpace/dspace-angular/pull/493 (Angular)

This option will revise PR2525 to remove the angular image from the docker-compose file in DSpace/DSpace. The angular image will only be start-able from the DSpace-angular repo.

This assumes that the docker-compose file for travis can be re-purposed for interactive testing.

Use Case	From Repo	Command
UC1	DSpace-angular	docker-compose -p d7 -f docker-compose.yml -f docker-compose-travis.yml up -d
UC2	DSpace	docker-compose -p d7 up -d --build
	DSpace-angular	docker-compose -p d7 up -d
UC3	DSpace-angular	docker-compose -p d7 -f docker-compose.yml -f docker-compose-travis.yml up -d --build
UC4	DSpace	docker-compose -p d7 up -d --build
	DSpace-angular	docker-compose -p d7 up -d --build

Refactor Option 3 (recommended)

This option contains the folowing PR's that allow a developer to start DSpace REST from DSpace/DSpace and DSpace UI from DSpace/DSpace-angular. An optional component would allow DSpace UI to be started from DSpace/DSpace.

- https://github.com/DSpace/DSpace/pull/2523 (6x)

- https://github.com/DSpace/DSpace/pull/2530 (7x)
- https://github.com/DSpace/dspace-angular/pull/493 (Angular)