Merge branch 'master' of https://github.com/docker-solr/docker-solr

* 'master' of https://github.com/docker-solr/docker-solr: Upgrade to Solr 8.6.3 (docker-solr#351) Bashbrew link changed Upgrading to 8.6.2 (docker-solr#344) Add a link to release docs Add Solr 8.6.1 Add Solr 8.6.0 (docker-solr#336) Add github user for Apache Solr project Upgrade to 8.5.2 Remove misleading documentation about download server in Europe Added new key Add the jattach tool (docker-solr#321) Add gsed to mac requirement. Needed to build docs repo Update maintainer information (docker-solr#313) Make solr-create more stable. Follow-up fix similar to docker-solr#311 (docker-solr#312) Fix race condition in wait-for-solr.sh (docker-solr#311)
dkd · Oct 20, 2020 · ab71934 · ab71934
2 parents 82538e7 + 0a94740
commit ab71934
Show file tree

Hide file tree

Showing 97 changed files with 1,848 additions and 104 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,14 @@ before_install:
 
 jobs:
   include:
+    - stage: build, test, deploy
+      env:
+      - PROCESS=8.6/slim
+      script: tools/build_test_push.sh 8.6/slim
+    - stage: build, test, deploy
+      env:
+      - PROCESS=8.6
+      script: tools/build_test_push.sh 8.6
     - stage: build, test, deploy
       env:
       - PROCESS=8.5/slim

diff --git a/5.5/Dockerfile b/5.5/Dockerfile
@@ -1,7 +1,7 @@
 
 FROM openjdk:8-jre
 
-LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
 
 ARG SOLR_VERSION="5.5.5"
@@ -17,7 +17,10 @@ ARG SOLR_DOWNLOAD_SERVER
 RUN set -ex; \
   apt-get update; \
   apt-get -y install acl dirmngr gpg lsof procps wget netcat gosu tini; \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/*; \
+  cd /usr/local/bin; wget -nv https://github.com/apangin/jattach/releases/download/v1.5/jattach; chmod 755 jattach; \
+  echo >jattach.sha512 "d8eedbb3e192a8596c08efedff99b9acf1075331e1747107c07cdb1718db2abe259ef168109e46bd4cf80d47d43028ff469f95e6ddcbdda4d7ffa73a20e852f9  jattach"; \
+  sha512sum -c jattach.sha512; rm jattach.sha512
 
 ENV SOLR_USER="solr" \
     SOLR_UID="8983" \

diff --git a/5.5/scripts/solr-create b/5.5/scripts/solr-create
@@ -50,7 +50,7 @@ else
 
     # See https://github.com/docker-solr/docker-solr/issues/27
     echo "Checking core"
-    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep -q instanceDir; then
+    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep instanceDir >/dev/null; then
       echo "Could not find any cores"
       exit 1
     fi

diff --git a/5.5/scripts/wait-for-solr.sh b/5.5/scripts/wait-for-solr.sh
@@ -79,7 +79,7 @@ grep -q -E '^https?://' <<<"$solr_url" || usage "--solr-url $solr_url: not a URL
 
 ((attempts_left=max_attempts))
 while (( attempts_left > 0 )); do
-  if wget -q -O - "$solr_url" | grep -q -i solr; then
+  if wget -q -O - "$solr_url" | grep -i solr >/dev/null; then
     break
   fi
   (( attempts_left-- ))

diff --git a/5.5/slim/Dockerfile b/5.5/slim/Dockerfile
@@ -1,7 +1,7 @@
 
 FROM openjdk:8-jre-slim
 
-LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
 
 ARG SOLR_VERSION="5.5.5"
@@ -17,7 +17,10 @@ ARG SOLR_DOWNLOAD_SERVER
 RUN set -ex; \
   apt-get update; \
   apt-get -y install acl dirmngr gpg lsof procps wget netcat gosu tini; \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/*; \
+  cd /usr/local/bin; wget -nv https://github.com/apangin/jattach/releases/download/v1.5/jattach; chmod 755 jattach; \
+  echo >jattach.sha512 "d8eedbb3e192a8596c08efedff99b9acf1075331e1747107c07cdb1718db2abe259ef168109e46bd4cf80d47d43028ff469f95e6ddcbdda4d7ffa73a20e852f9  jattach"; \
+  sha512sum -c jattach.sha512; rm jattach.sha512
 
 ENV SOLR_USER="solr" \
     SOLR_UID="8983" \

diff --git a/5.5/slim/scripts/solr-create b/5.5/slim/scripts/solr-create
@@ -50,7 +50,7 @@ else
 
     # See https://github.com/docker-solr/docker-solr/issues/27
     echo "Checking core"
-    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep -q instanceDir; then
+    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep instanceDir >/dev/null; then
       echo "Could not find any cores"
       exit 1
     fi

diff --git a/5.5/slim/scripts/wait-for-solr.sh b/5.5/slim/scripts/wait-for-solr.sh
@@ -79,7 +79,7 @@ grep -q -E '^https?://' <<<"$solr_url" || usage "--solr-url $solr_url: not a URL
 
 ((attempts_left=max_attempts))
 while (( attempts_left > 0 )); do
-  if wget -q -O - "$solr_url" | grep -q -i solr; then
+  if wget -q -O - "$solr_url" | grep -i solr >/dev/null; then
     break
   fi
   (( attempts_left-- ))

diff --git a/6.6/Dockerfile b/6.6/Dockerfile
@@ -1,7 +1,7 @@
 
 FROM openjdk:8-jre
 
-LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
 
 ARG SOLR_VERSION="6.6.6"
@@ -17,7 +17,10 @@ ARG SOLR_DOWNLOAD_SERVER
 RUN set -ex; \
   apt-get update; \
   apt-get -y install acl dirmngr gpg lsof procps wget netcat gosu tini; \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/*; \
+  cd /usr/local/bin; wget -nv https://github.com/apangin/jattach/releases/download/v1.5/jattach; chmod 755 jattach; \
+  echo >jattach.sha512 "d8eedbb3e192a8596c08efedff99b9acf1075331e1747107c07cdb1718db2abe259ef168109e46bd4cf80d47d43028ff469f95e6ddcbdda4d7ffa73a20e852f9  jattach"; \
+  sha512sum -c jattach.sha512; rm jattach.sha512
 
 ENV SOLR_USER="solr" \
     SOLR_UID="8983" \

diff --git a/6.6/scripts/solr-create b/6.6/scripts/solr-create
@@ -50,7 +50,7 @@ else
 
     # See https://github.com/docker-solr/docker-solr/issues/27
     echo "Checking core"
-    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep -q instanceDir; then
+    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep instanceDir >/dev/null; then
       echo "Could not find any cores"
       exit 1
     fi

diff --git a/6.6/scripts/wait-for-solr.sh b/6.6/scripts/wait-for-solr.sh
@@ -79,7 +79,7 @@ grep -q -E '^https?://' <<<"$solr_url" || usage "--solr-url $solr_url: not a URL
 
 ((attempts_left=max_attempts))
 while (( attempts_left > 0 )); do
-  if wget -q -O - "$solr_url" | grep -q -i solr; then
+  if wget -q -O - "$solr_url" | grep -i solr >/dev/null; then
     break
   fi
   (( attempts_left-- ))

diff --git a/6.6/slim/Dockerfile b/6.6/slim/Dockerfile
@@ -1,7 +1,7 @@
 
 FROM openjdk:8-jre-slim
 
-LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
 
 ARG SOLR_VERSION="6.6.6"
@@ -17,7 +17,10 @@ ARG SOLR_DOWNLOAD_SERVER
 RUN set -ex; \
   apt-get update; \
   apt-get -y install acl dirmngr gpg lsof procps wget netcat gosu tini; \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/*; \
+  cd /usr/local/bin; wget -nv https://github.com/apangin/jattach/releases/download/v1.5/jattach; chmod 755 jattach; \
+  echo >jattach.sha512 "d8eedbb3e192a8596c08efedff99b9acf1075331e1747107c07cdb1718db2abe259ef168109e46bd4cf80d47d43028ff469f95e6ddcbdda4d7ffa73a20e852f9  jattach"; \
+  sha512sum -c jattach.sha512; rm jattach.sha512
 
 ENV SOLR_USER="solr" \
     SOLR_UID="8983" \

diff --git a/6.6/slim/scripts/solr-create b/6.6/slim/scripts/solr-create
@@ -50,7 +50,7 @@ else
 
     # See https://github.com/docker-solr/docker-solr/issues/27
     echo "Checking core"
-    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep -q instanceDir; then
+    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep instanceDir >/dev/null; then
       echo "Could not find any cores"
       exit 1
     fi

diff --git a/6.6/slim/scripts/wait-for-solr.sh b/6.6/slim/scripts/wait-for-solr.sh
@@ -79,7 +79,7 @@ grep -q -E '^https?://' <<<"$solr_url" || usage "--solr-url $solr_url: not a URL
 
 ((attempts_left=max_attempts))
 while (( attempts_left > 0 )); do
-  if wget -q -O - "$solr_url" | grep -q -i solr; then
+  if wget -q -O - "$solr_url" | grep -i solr >/dev/null; then
     break
   fi
   (( attempts_left-- ))

diff --git a/7.7/Dockerfile b/7.7/Dockerfile
@@ -1,7 +1,7 @@
 
 FROM openjdk:11-jre
 
-LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
 
 ARG SOLR_VERSION="7.7.3"
@@ -17,7 +17,10 @@ ARG SOLR_DOWNLOAD_SERVER
 RUN set -ex; \
   apt-get update; \
   apt-get -y install acl dirmngr gpg lsof procps wget netcat gosu tini; \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/*; \
+  cd /usr/local/bin; wget -nv https://github.com/apangin/jattach/releases/download/v1.5/jattach; chmod 755 jattach; \
+  echo >jattach.sha512 "d8eedbb3e192a8596c08efedff99b9acf1075331e1747107c07cdb1718db2abe259ef168109e46bd4cf80d47d43028ff469f95e6ddcbdda4d7ffa73a20e852f9  jattach"; \
+  sha512sum -c jattach.sha512; rm jattach.sha512
 
 ENV SOLR_USER="solr" \
     SOLR_UID="8983" \

diff --git a/7.7/scripts/solr-create b/7.7/scripts/solr-create
@@ -50,7 +50,7 @@ else
 
     # See https://github.com/docker-solr/docker-solr/issues/27
     echo "Checking core"
-    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep -q instanceDir; then
+    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep instanceDir >/dev/null; then
       echo "Could not find any cores"
       exit 1
     fi

diff --git a/7.7/scripts/wait-for-solr.sh b/7.7/scripts/wait-for-solr.sh
@@ -79,7 +79,7 @@ grep -q -E '^https?://' <<<"$solr_url" || usage "--solr-url $solr_url: not a URL
 
 ((attempts_left=max_attempts))
 while (( attempts_left > 0 )); do
-  if wget -q -O - "$solr_url" | grep -q -i solr; then
+  if wget -q -O - "$solr_url" | grep -i solr >/dev/null; then
     break
   fi
   (( attempts_left-- ))

diff --git a/7.7/slim/Dockerfile b/7.7/slim/Dockerfile
@@ -1,7 +1,7 @@
 
 FROM openjdk:11-jre-slim
 
-LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
 
 ARG SOLR_VERSION="7.7.3"
@@ -17,7 +17,10 @@ ARG SOLR_DOWNLOAD_SERVER
 RUN set -ex; \
   apt-get update; \
   apt-get -y install acl dirmngr gpg lsof procps wget netcat gosu tini; \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/*; \
+  cd /usr/local/bin; wget -nv https://github.com/apangin/jattach/releases/download/v1.5/jattach; chmod 755 jattach; \
+  echo >jattach.sha512 "d8eedbb3e192a8596c08efedff99b9acf1075331e1747107c07cdb1718db2abe259ef168109e46bd4cf80d47d43028ff469f95e6ddcbdda4d7ffa73a20e852f9  jattach"; \
+  sha512sum -c jattach.sha512; rm jattach.sha512
 
 ENV SOLR_USER="solr" \
     SOLR_UID="8983" \

diff --git a/7.7/slim/scripts/solr-create b/7.7/slim/scripts/solr-create
@@ -50,7 +50,7 @@ else
 
     # See https://github.com/docker-solr/docker-solr/issues/27
     echo "Checking core"
-    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep -q instanceDir; then
+    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep instanceDir >/dev/null; then
       echo "Could not find any cores"
       exit 1
     fi

diff --git a/7.7/slim/scripts/wait-for-solr.sh b/7.7/slim/scripts/wait-for-solr.sh
@@ -79,7 +79,7 @@ grep -q -E '^https?://' <<<"$solr_url" || usage "--solr-url $solr_url: not a URL
 
 ((attempts_left=max_attempts))
 while (( attempts_left > 0 )); do
-  if wget -q -O - "$solr_url" | grep -q -i solr; then
+  if wget -q -O - "$solr_url" | grep -i solr >/dev/null; then
     break
   fi
   (( attempts_left-- ))

diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -1,7 +1,7 @@
 
 FROM openjdk:11-jre
 
-LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
 
 ARG SOLR_VERSION="8.0.0"
@@ -17,7 +17,10 @@ ARG SOLR_DOWNLOAD_SERVER
 RUN set -ex; \
   apt-get update; \
   apt-get -y install acl dirmngr gpg lsof procps wget netcat gosu tini; \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/*; \
+  cd /usr/local/bin; wget -nv https://github.com/apangin/jattach/releases/download/v1.5/jattach; chmod 755 jattach; \
+  echo >jattach.sha512 "d8eedbb3e192a8596c08efedff99b9acf1075331e1747107c07cdb1718db2abe259ef168109e46bd4cf80d47d43028ff469f95e6ddcbdda4d7ffa73a20e852f9  jattach"; \
+  sha512sum -c jattach.sha512; rm jattach.sha512
 
 ENV SOLR_USER="solr" \
     SOLR_UID="8983" \

diff --git a/8.0/scripts/solr-create b/8.0/scripts/solr-create
@@ -48,7 +48,7 @@ else
 
     # See https://github.com/docker-solr/docker-solr/issues/27
     echo "Checking core"
-    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep -q instanceDir; then
+    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep instanceDir >/dev/null; then
       echo "Could not find any cores"
       exit 1
     fi

diff --git a/8.0/scripts/wait-for-solr.sh b/8.0/scripts/wait-for-solr.sh
@@ -79,7 +79,7 @@ grep -q -E '^https?://' <<<"$solr_url" || usage "--solr-url $solr_url: not a URL
 
 ((attempts_left=max_attempts))
 while (( attempts_left > 0 )); do
-  if wget -q -O - "$solr_url" | grep -q -i solr; then
+  if wget -q -O - "$solr_url" | grep -i solr >/dev/null; then
     break
   fi
   (( attempts_left-- ))

diff --git a/8.0/slim/Dockerfile b/8.0/slim/Dockerfile
@@ -1,7 +1,7 @@
 
 FROM openjdk:11-jre-slim
 
-LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
 
 ARG SOLR_VERSION="8.0.0"
@@ -17,7 +17,10 @@ ARG SOLR_DOWNLOAD_SERVER
 RUN set -ex; \
   apt-get update; \
   apt-get -y install acl dirmngr gpg lsof procps wget netcat gosu tini; \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/*; \
+  cd /usr/local/bin; wget -nv https://github.com/apangin/jattach/releases/download/v1.5/jattach; chmod 755 jattach; \
+  echo >jattach.sha512 "d8eedbb3e192a8596c08efedff99b9acf1075331e1747107c07cdb1718db2abe259ef168109e46bd4cf80d47d43028ff469f95e6ddcbdda4d7ffa73a20e852f9  jattach"; \
+  sha512sum -c jattach.sha512; rm jattach.sha512
 
 ENV SOLR_USER="solr" \
     SOLR_UID="8983" \

diff --git a/8.0/slim/scripts/solr-create b/8.0/slim/scripts/solr-create
@@ -48,7 +48,7 @@ else
 
     # See https://github.com/docker-solr/docker-solr/issues/27
     echo "Checking core"
-    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep -q instanceDir; then
+    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep instanceDir >/dev/null; then
       echo "Could not find any cores"
       exit 1
     fi

diff --git a/8.0/slim/scripts/wait-for-solr.sh b/8.0/slim/scripts/wait-for-solr.sh
@@ -79,7 +79,7 @@ grep -q -E '^https?://' <<<"$solr_url" || usage "--solr-url $solr_url: not a URL
 
 ((attempts_left=max_attempts))
 while (( attempts_left > 0 )); do
-  if wget -q -O - "$solr_url" | grep -q -i solr; then
+  if wget -q -O - "$solr_url" | grep -i solr >/dev/null; then
     break
   fi
   (( attempts_left-- ))

diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -1,7 +1,7 @@
 
 FROM openjdk:11-jre
 
-LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
 
 ARG SOLR_VERSION="8.1.1"
@@ -17,7 +17,10 @@ ARG SOLR_DOWNLOAD_SERVER
 RUN set -ex; \
   apt-get update; \
   apt-get -y install acl dirmngr gpg lsof procps wget netcat gosu tini; \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/*; \
+  cd /usr/local/bin; wget -nv https://github.com/apangin/jattach/releases/download/v1.5/jattach; chmod 755 jattach; \
+  echo >jattach.sha512 "d8eedbb3e192a8596c08efedff99b9acf1075331e1747107c07cdb1718db2abe259ef168109e46bd4cf80d47d43028ff469f95e6ddcbdda4d7ffa73a20e852f9  jattach"; \
+  sha512sum -c jattach.sha512; rm jattach.sha512
 
 ENV SOLR_USER="solr" \
     SOLR_UID="8983" \

diff --git a/8.1/scripts/solr-create b/8.1/scripts/solr-create
@@ -48,7 +48,7 @@ else
 
     # See https://github.com/docker-solr/docker-solr/issues/27
     echo "Checking core"
-    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep -q instanceDir; then
+    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep instanceDir >/dev/null; then
       echo "Could not find any cores"
       exit 1
     fi

diff --git a/8.1/scripts/wait-for-solr.sh b/8.1/scripts/wait-for-solr.sh
@@ -79,7 +79,7 @@ grep -q -E '^https?://' <<<"$solr_url" || usage "--solr-url $solr_url: not a URL
 
 ((attempts_left=max_attempts))
 while (( attempts_left > 0 )); do
-  if wget -q -O - "$solr_url" | grep -q -i solr; then
+  if wget -q -O - "$solr_url" | grep -i solr >/dev/null; then
     break
   fi
   (( attempts_left-- ))

diff --git a/8.1/slim/Dockerfile b/8.1/slim/Dockerfile
@@ -1,7 +1,7 @@
 
 FROM openjdk:11-jre-slim
 
-LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
 
 ARG SOLR_VERSION="8.1.1"
@@ -17,7 +17,10 @@ ARG SOLR_DOWNLOAD_SERVER
 RUN set -ex; \
   apt-get update; \
   apt-get -y install acl dirmngr gpg lsof procps wget netcat gosu tini; \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/*; \
+  cd /usr/local/bin; wget -nv https://github.com/apangin/jattach/releases/download/v1.5/jattach; chmod 755 jattach; \
+  echo >jattach.sha512 "d8eedbb3e192a8596c08efedff99b9acf1075331e1747107c07cdb1718db2abe259ef168109e46bd4cf80d47d43028ff469f95e6ddcbdda4d7ffa73a20e852f9  jattach"; \
+  sha512sum -c jattach.sha512; rm jattach.sha512
 
 ENV SOLR_USER="solr" \
     SOLR_UID="8983" \

diff --git a/8.1/slim/scripts/solr-create b/8.1/slim/scripts/solr-create
@@ -48,7 +48,7 @@ else
 
     # See https://github.com/docker-solr/docker-solr/issues/27
     echo "Checking core"
-    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep -q instanceDir; then
+    if ! wget -O - "http://localhost:${SOLR_PORT:-8983}/solr/admin/cores?action=STATUS" | grep instanceDir >/dev/null; then
       echo "Could not find any cores"
       exit 1
     fi