From 72e946607ff431cfcc4088ff2d50adddb8aaa75b Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Mon, 6 Mar 2023 08:19:50 -0600
Subject: [PATCH] Move wait for solr to docker-compose

---
 docker-compose.yml | 7 +++++++
 start.sh           | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 17022507e..6bc22b2b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,6 +33,13 @@ services:
       - vivo
     depends_on:
       - solr
+    entrypoint:
+      - /bin/bash
+      - '-c'
+      - |
+        while (!</dev/tcp/solr/8983) > /dev/null 2>&1; do sleep 1; done;
+        sleep 5
+        /start.sh
 
 networks:
   vivo:
diff --git a/start.sh b/start.sh
index 049fa447b..aeee24b1b 100644
--- a/start.sh
+++ b/start.sh
@@ -49,8 +49,4 @@ if [ -f /applicationSetup.n3 ]; then
   fi
 fi
 
-echo "Giving time for Solr to startup..."
-sleep 15
-echo "Starting Tomcat"
-
 catalina.sh run