hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

move all compose files to one dir

Browse Source
This commit is contained in:
Terry Brady
2019-10-01 23:30:26 -07:00
parent a74f256cea
commit dc47d191ec
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docker/README.md
View File

@@ -1,10 +1,8 @@
# Docker Compose files # Docker Compose files
## root directory ## docker directory
- docker-compose.yml - docker-compose.yml
- Starts DSpace Angular with Docker Compose from the current branch. This file assumes that a DSpace 7 REST instance will also be started in Docker. - Starts DSpace Angular with Docker Compose from the current branch. This file assumes that a DSpace 7 REST instance will also be started in Docker.
## docker directory
- docker-compose-rest.yml - docker-compose-rest.yml
- Runs a published instance of the DSpace 7 REST API - persists data in Docker volumes - Runs a published instance of the DSpace 7 REST API - persists data in Docker volumes
- docker-compose-travis.yml - docker-compose-travis.yml
@@ -21,18 +19,18 @@
## To refresh / pull DSpace images from Dockerhub ## To refresh / pull DSpace images from Dockerhub
``` ```
docker-compose pull docker-compose -f docker/docker-compose.yml pull
``` ```
## To build DSpace images using code in your branch ## To build DSpace images using code in your branch
``` ```
docker-compose build docker-compose-f docker/docker-compose.yml build
``` ```
## To start DSpace (REST and Angular) from your branch ## To start DSpace (REST and Angular) from your branch
``` ```
docker-compose -p d7 -f docker/docker-compose-rest.yml -f docker-compose.yml up -d docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
``` ```
## Run DSpace REST and DSpace Angular from local branches. ## Run DSpace REST and DSpace Angular from local branches.
@@ -60,6 +58,12 @@ Load content from AIP files
docker-compose -p d7 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli docker-compose -p d7 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
``` ```
## Alternative Ingest - Use Entities dataset
_Delete your docker volumes or use a unique project (-p) name_
```
docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -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._

2
docker/docker-compose-rest.yml
View File

@@ -26,6 +26,8 @@ services:
dspacedb: dspacedb:
container_name: dspacedb container_name: dspacedb
image: dspace/dspace-postgres-pgcrypto image: dspace/dspace-postgres-pgcrypto
environment:
PGDATA: /pgdata
networks: networks:
dspacenet: dspacenet:
stdin_open: true stdin_open: true

4
docker-compose.yml → docker/docker-compose.yml
View File

@@ -11,7 +11,7 @@ services:
DSPACE_SSL: "false" DSPACE_SSL: "false"
image: dspace/dspace-angular:latest image: dspace/dspace-angular:latest
build: build:
context: . context: ..
dockerfile: Dockerfile dockerfile: Dockerfile
networks: networks:
dspacenet: dspacenet:
@@ -23,4 +23,4 @@ services:
stdin_open: true stdin_open: true
tty: true tty: true
volumes: volumes:
- ./docker/environment.dev.js:/app/config/environment.dev.js - ./environment.dev.js:/app/config/environment.dev.js