From 5e041a25e1bfa0bb955c22838edfab3b15a5877e Mon Sep 17 00:00:00 2001
From: Charity Hilton <Charity.Hilton@gtri.gatech.edu>
Date: Tue, 14 Aug 2018 13:25:19 -0400
Subject: [PATCH] add results client to docker compose

---
 .env.example             |  6 ++++++
 .gitmodules              |  3 +++
 docker-compose.prod.yml  | 11 ++++++++++-
 docker-compose.yml       | 11 +++++++++++
 run_claritynlp.sh        |  3 ++-
 utilities/results-client |  1 +
 6 files changed, 33 insertions(+), 2 deletions(-)
 create mode 160000 utilities/results-client

diff --git a/.env.example b/.env.example
index c82e5d66..97860230 100644
--- a/.env.example
+++ b/.env.example
@@ -98,5 +98,11 @@ SOLR_REPORT_DATE_FIELD=report_date
 SOLR_SUBJECT_FIELD=subject
 SOLR_REPORT_TYPE_FIELD=report_type
 
+# RESULTS CLIENT
+RESULTS_CLIENT_HOSTNAME=results-client
+RESULTS_CLIENT_HOST_PORT=8200
+RESULTS_CLIENT_CONTAINER_PORT=8201
+
+
 #GENERIC
 BASE_URL=http://localhost
diff --git a/.gitmodules b/.gitmodules
index 3f5530b8..1eef2e93 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "utilities/ingest-client"]
 	path = utilities/ingest-client
 	url = https://github.com/ClarityNLP/ingest-client.git
+[submodule "utilities/results-client"]
+	path = utilities/results-client
+	url = https://github.com/ClarityNLP/results-viewer
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 14fd628c..182ab143 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -120,7 +120,7 @@ services:
       context: ./utilities/ingest-client
       dockerfile: Dockerfile.prod
     ports:
-      - "${INGEST_CLIENT_HOST_PORT}:${INGESET_CLIENT_CONTAINER_PORT}"
+      - "${INGEST_CLIENT_HOST_PORT}:${INGEST_CLIENT_CONTAINER_PORT}"
 
   mapper-api:
     container_name: MAPPER_API
@@ -163,6 +163,15 @@ services:
     env_file:
       - .env
 
+  results-client:
+    container_name: RESULTS_CLIENT
+    hostname: ${RESULTS_CLIENT_HOSTNAME}
+    build:
+      context: ./utilities/results-client
+      dockerfile: Dockerfile.prod
+    ports:
+      - "${RESULTS_CLIENT_HOST_PORT}:${RESULTS_CLIENT_CONTAINER_PORT}"
+
   swagger:
     container_name: MAPPER_SWAGGER
     hostname: ${MAPPER_SWAGGER_HOSTNAME}
diff --git a/docker-compose.yml b/docker-compose.yml
index 70f7bf53..e89549b3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -187,6 +187,17 @@ services:
     volumes:
     - 'mapper-redisdata:/data'
 
+  results-client:
+    container_name: RESULTS_CLIENT
+    hostname: ${RESULTS_CLIENT_HOSTNAME}
+    build:
+      context: ./utilities/results-client
+      dockerfile: Dockerfile
+    environment:
+      - "PORT=${RESULTS_CLIENT_HOST_PORT}"
+    ports:
+      - "${RESULTS_CLIENT_HOST_PORT}:${RESULTS_CLIENT_CONTAINER_PORT}"
+
   swagger:
     container_name: MAPPER_Swagger_Docs
     hostname: ${MAPPER_SWAGGER_HOSTNAME}
diff --git a/run_claritynlp.sh b/run_claritynlp.sh
index b40d6b30..eca3ffe3 100644
--- a/run_claritynlp.sh
+++ b/run_claritynlp.sh
@@ -6,7 +6,8 @@ echo "Updating repository..."
 git pull
 
 echo "Updating submodules..."
-git submodule update --recursive
+git submodule update --recursive --remote
+
 
 echo "Running ClarityNLP..."
 docker-compose up --build
diff --git a/utilities/results-client b/utilities/results-client
new file mode 160000
index 00000000..bebe5bf4
--- /dev/null
+++ b/utilities/results-client
@@ -0,0 +1 @@
+Subproject commit bebe5bf4f8932b431543a60729541031edb9f43d