Add pull vs build instructions to README

This commit is contained in:
Terry Brady
2019-10-01 15:38:19 -07:00
parent f85d4fa033
commit 292f7ddd25

View File

@@ -19,34 +19,37 @@
- Environment file for running the DSpace 7 REST API in Docker. - Environment file for running the DSpace 7 REST API in Docker.
## To start DSpace from your branch using a published images for DSpace REST and DSpace Angular. ## To refresh / pull DSpace images from Dockerhub
``` ```
docker-compose -p d7 -f docker-compose.yml -f docker/docker-compose-rest.yml up -d docker-compose pull
``` ```
## To build DSpace Angular from your branch using a published image for DSpace REST. ## To build DSpace images using code in your branch
``` ```
docker-compose -p d7 -f docker-compose.yml -f docker/docker-compose-rest.yml up --build -d docker-compose build
``` ```
## To build DSpace REST and DSpace Angular. ## To start DSpace (REST and Angular) from your branch
_The system will be started in 2 steps. Each step shares the same docker network._ ```
docker-compose -p d7 -f docker-compose.yml -f docker/docker-compose-rest.yml up -d
```
From DSpace/DSpace ## To build DSpace REST and DSpace Angular.
``` _The system will be started in 2 steps. Each step shares the same docker network._
docker-compose -p d7 up --build -d
```
From DSpace/DSpace
```
docker-compose -p d7 up --build -d
```
From DSpace/DSpace-angular From DSpace/DSpace-angular
``` ```
docker-compose -p d7 up --build -d docker-compose -p d7 up --build -d
``` ```
## End to end testing of the rest api (runs in travis). ## End to end testing of the rest api (runs in travis).
_In this instance, only the REST api runs in Docker. Travis will perform CI testing of Angular using Node to drive the tests._ _In this instance, only the REST api runs in Docker. Travis will perform CI testing of Angular using Node to drive the tests._
```
``` docker-compose -p d7ci -f docker/docker-compose-travis.yml up -d
docker-compose -p d7ci -f docker/docker-compose-travis.yml up -d ```
```