Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

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 CaseFrom RepoCommand
UC1

DSpace
or

DSpace-angular

docker-compose -p d7 up -d
UC2DSpacedocker-compose -p d7 up -d --build
UC3DSpace-angulardocker-compose -p d7 up -d --build
UC4DSpacedocker-compose -p d7 --build  (this will update the image locally)

DSpace-angulardocker-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.

...

Use CaseFrom RepoCommand
UC1

DSpace-angular

docker-compose -p d7 -f docker-compose.yml -f docker-compose-travis.yml up -d
UC2DSpacedocker-compose -p d7 up -d --build

DSpace-angulardocker-compose -p d7 up -d 
UC3DSpace-angulardocker-compose -p d7 -f docker-compose.yml -f docker-compose-travis.yml up -d --build
UC4DSpacedocker-compose -p d7 up -d --build

DSpace-angulardocker-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)


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 CaseFrom RepoCommand
UC1

DSpace-angular

or

DSpace

docker-compose -p d7 -f docker-compose.yml -f docker/docker-compose-rest.yml up -d


docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-angular.yml up -d

UC2DSpacedocker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-angular.yml up -d --build
UC3DSpace-angulardocker-compose -p d7 -f docker-compose.yml -f docker/docker-compose-rest.yml up -d --build
UC4DSpacedocker-compose -p d7 up -d --build

DSpace-angulardocker-compose -p d7 up -d --build

...