From dc47d191ecb200cc9a9fb972090eb294206a48b7 Mon Sep 17 00:00:00 2001
From: Terry Brady <terrywbrady@gmail.com>
Date: Tue, 1 Oct 2019 23:30:26 -0700
Subject: [PATCH] move all compose files to one dir

---
 docker/README.md                                | 16 ++++++++++------
 docker/docker-compose-rest.yml                  |  2 ++
 docker-compose.yml => docker/docker-compose.yml |  6 +++---
 3 files changed, 15 insertions(+), 9 deletions(-)
 rename docker-compose.yml => docker/docker-compose.yml (82%)

diff --git a/docker/README.md b/docker/README.md
index 6a5077303b..097ab37694 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,10 +1,8 @@
 # Docker Compose files
 
-## root directory
+## docker directory
 - 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.
-
-## docker directory
 - docker-compose-rest.yml
   - Runs a published instance of the DSpace 7 REST API - persists data in Docker volumes
 - docker-compose-travis.yml
@@ -21,18 +19,18 @@
 
 ## 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
 ```
-docker-compose build
+docker-compose-f docker/docker-compose.yml build
 ```
 
 ## 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.
@@ -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
 ```
 
+## 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).
 _In this instance, only the REST api runs in Docker.  Travis will perform CI testing of Angular using Node to drive the tests._
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index b861cdcfec..222557bc81 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -26,6 +26,8 @@ services:
   dspacedb:
     container_name: dspacedb
     image: dspace/dspace-postgres-pgcrypto
+    environment:
+      PGDATA: /pgdata
     networks:
       dspacenet:
     stdin_open: true
diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 82%
rename from docker-compose.yml
rename to docker/docker-compose.yml
index e6b4eb3d6c..23f0615a1f 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -11,10 +11,10 @@ services:
       DSPACE_SSL: "false"
     image: dspace/dspace-angular:latest
     build:
-      context: .
+      context: ..
       dockerfile: Dockerfile
     networks:
-      dspacenet: 
+      dspacenet:
     ports:
     - published: 3000
       target: 3000
@@ -23,4 +23,4 @@ services:
     stdin_open: true
     tty: true
     volumes:
-    - ./docker/environment.dev.js:/app/config/environment.dev.js
+    - ./environment.dev.js:/app/config/environment.dev.js