From 9d6412dad67fbdfc38d208c4f15e7d6367b127fc Mon Sep 17 00:00:00 2001
From: Netkas <netkas@intellivoid.info>
Date: Fri, 8 Jan 2021 23:47:25 -0500
Subject: [PATCH] Updated Docker

---
 Docker/bootstrap     | 9 +++++++++
 Docker/update_server | 5 ++++-
 Makefile             | 1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Docker/bootstrap b/Docker/bootstrap
index bbc885eb..713ff8f8 100644
--- a/Docker/bootstrap
+++ b/Docker/bootstrap
@@ -13,6 +13,8 @@ else
     make start_langdetect &
     echo "### Starting CoffeeHouse-SpamDetect ###"
     make start_spamdetect &
+    echo "### Starting CoffeeHouse-CoreNLP ###"
+    make start_corenlp &
 
     while sleep 60; do
 
@@ -32,5 +34,12 @@ else
         echo "ERROR: coffeehouse_spamdetection has been terminated, terminating container."
         exit 1
       fi
+
+      ps aux | grep edu.stanford.nlp.pipeline.StanfordCoreNLPServer | grep -q -v grep
+      CORENLP_STATUS=$?
+      if [ $CORENLP_STATUS -ne 0 ]; then
+        echo "ERROR: coffeehouse_corenlp has been terminated, terminating container."
+        exit 1
+      fi
     done
 fi
\ No newline at end of file
diff --git a/Docker/update_server b/Docker/update_server
index d8d390b7..cdc1c7af 100644
--- a/Docker/update_server
+++ b/Docker/update_server
@@ -10,7 +10,7 @@ read -p 'Enter your 25-50 character PAT: ' GIT_API_KEY
 echo " #### Cloning CoffeeHousePy"
 git clone https://${GIT_API_KEY}@github.com/Intellivoid/CoffeeHousePy.git
 cd /CoffeeHousePy
-git checkout production
+git checkout corenlp
 
 echo " #### Preparing System for Python"
 make system_prep_python
@@ -21,5 +21,8 @@ make system_prep_pip
 echo " #### Preparing System for GCC"
 make system_prep_gcc
 
+echo " #### Preparing System for Java"
+make system_prep_java
+
 echo " #### Building and Installing CoffeeHousePy"
 make install
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 13ed0316..6b26ef69 100644
--- a/Makefile
+++ b/Makefile
@@ -147,6 +147,7 @@ install:
 	make install_translation
 	make install_langdetect
 	make install_spamdetect
+	make build_corenlp
 
 # ======================================================================================================================