Update docker-entrypoint.sh: Fix curl calls in running checks

Helped-by: Nils Küster <nils.kuester@ruhr-uni-bochum.de>
Proposed-by: Pascal Ernster <pascal.ernster@ruhr-uni-bochum.de>
Signed-off-by: Till Jasper Kraenke <till.kraenke@ruhr-uni-bochum.de>

hyrax/docker-entrypoint.sh

@@ -27,7 +27,7 @@ while [ ${n} -lt 15 ]
 do
     # check Solr is running
     if [ ${solr_running} -eq 0 ] ; then
-      solr_curl=$(curl --silent --connect-timeout 45 "http://${SOLR_HOST:-solr}:${SOLR_PORT:-8983}/solr/" | grep "Apache SOLR")
+      solr_curl=$(curl --fail --silent --connect-timeout 45 "http://${SOLR_HOST:-solr}:${SOLR_PORT:-8983}/solr/" | grep "Apache SOLR")
       if [ -n "${solr_curl}" ] ; then
           echo "Solr is running"
           solr_running=1
@@ -36,7 +36,7 @@ do
 
     # check Fedora is running
     if [ ${fedora_running} -eq 0 ] ; then
-      fedora_curl=$(curl --silent --connect-timeout 45 "http://${FEDORA_HOST:-fcrepo}:${FEDORA_PORT:-8080}/" | grep "Fedora Commons Repository")
+      fedora_curl=$(curl --fail --silent --connect-timeout 45 "http://${FEDORA_HOST:-fcrepo}:${FEDORA_PORT:-8080}${FCREPO_PATH:-/fcrepo/rest}" | grep -i -E "^\s*rdf:type\s+fedora:RepositoryRoot\s*;\s*$")
       if [ -n "${fedora_curl}" ] ; then
           echo "Fedora is running"
           fedora_running=1