Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Solr to 5.5.4, 6.4.2 #2729

Merged
merged 2 commits into from
Mar 14, 2017
Merged

Update Solr to 5.5.4, 6.4.2 #2729

merged 2 commits into from
Mar 14, 2017

Conversation

makuk66
Copy link
Contributor

@makuk66 makuk66 commented Mar 8, 2017

@tianon
Copy link
Member

tianon commented Mar 8, 2017

warning: insecure protocol git:// detected: git://github.com/docker-solr/docker-solr
diff --git a/_bashbrew-list b/_bashbrew-list
index f4742fb..38f3e4f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,8 +2,8 @@ solr:5
 solr:5-alpine
 solr:5.5
 solr:5.5-alpine
-solr:5.5.3
-solr:5.5.3-alpine
+solr:5.5.4
+solr:5.5.4-alpine
 solr:6
 solr:6-alpine
 solr:6.3
@@ -12,7 +12,7 @@ solr:6.3.0
 solr:6.3.0-alpine
 solr:6.4
 solr:6.4-alpine
-solr:6.4.1
-solr:6.4.1-alpine
+solr:6.4.2
+solr:6.4.2-alpine
 solr:alpine
 solr:latest
diff --git a/solr_5-alpine/Dockerfile b/solr_5-alpine/Dockerfile
index 8fff3fb..556d98c 100644
--- a/solr_5-alpine/Dockerfile
+++ b/solr_5-alpine/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apk add --no-cache \
         lsof \
         gnupg \
@@ -25,16 +21,18 @@ ENV SOLR_UID 8983
 RUN addgroup -S -g $SOLR_UID $SOLR_USER && \
   adduser -S -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY EDF961FF03E647F9CA8A9C2C758051CCA3A13A7F
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$SOLR_KEY"
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
+ENV SOLR_VERSION 5.5.4
+
+ENV SOLR_KEY E6E21FFCDCEA14C95910EA65051A0FAF76BC6507
+ENV KEYS https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/KEYS
 
-ENV SOLR_VERSION 5.5.3
-ENV SOLR_SHA256 74e8a924dac0e073854af121a6de9d58fe8cc315d16b57e17f429c6a91b0b065
+ENV SOLR_SHA256 c1528e4afc9a0b8e7e5be0a16f40bb4080f410d502cd63b4447d448c49e9f500
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
 
 RUN mkdir -p /opt/solr && \
+  wget -nv $KEYS -O /opt/KEYS && \
+  gpg --import /opt/KEYS && \
+  rm /opt/KEYS && \
   echo "downloading $SOLR_URL" && \
   wget -q $SOLR_URL -O /opt/solr.tgz && \
   echo "downloading $SOLR_URL.asc" && \
diff --git a/solr_5-alpine/scripts/init-solr-home b/solr_5-alpine/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_5-alpine/scripts/init-solr-home
+++ b/solr_5-alpine/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents
diff --git a/solr_5/Dockerfile b/solr_5/Dockerfile
index 7b891da..d904e24 100644
--- a/solr_5/Dockerfile
+++ b/solr_5/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apt-get update && \
   apt-get -y install lsof && \
   rm -rf /var/lib/apt/lists/*
@@ -20,15 +16,18 @@ ENV SOLR_UID 8983
 RUN groupadd -r -g $SOLR_UID $SOLR_USER && \
   useradd -r -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY EDF961FF03E647F9CA8A9C2C758051CCA3A13A7F
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
+ENV SOLR_VERSION 5.5.4
+
+ENV SOLR_KEY E6E21FFCDCEA14C95910EA65051A0FAF76BC6507
+ENV KEYS https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/KEYS
 
-ENV SOLR_VERSION 5.5.3
-ENV SOLR_SHA256 74e8a924dac0e073854af121a6de9d58fe8cc315d16b57e17f429c6a91b0b065
+ENV SOLR_SHA256 c1528e4afc9a0b8e7e5be0a16f40bb4080f410d502cd63b4447d448c49e9f500
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
 
 RUN mkdir -p /opt/solr && \
+  wget -nv $KEYS -O /opt/KEYS && \
+  gpg --import /opt/KEYS && \
+  rm /opt/KEYS && \
   wget -nv $SOLR_URL -O /opt/solr.tgz && \
   wget -nv $SOLR_URL.asc -O /opt/solr.tgz.asc && \
   echo "$SOLR_SHA256 */opt/solr.tgz" | sha256sum -c - && \
diff --git a/solr_5/scripts/init-solr-home b/solr_5/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_5/scripts/init-solr-home
+++ b/solr_5/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents
diff --git a/solr_6.3-alpine/Dockerfile b/solr_6.3-alpine/Dockerfile
index 50e30d3..597c79f 100644
--- a/solr_6.3-alpine/Dockerfile
+++ b/solr_6.3-alpine/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apk add --no-cache \
         lsof \
         gnupg \
@@ -25,16 +21,18 @@ ENV SOLR_UID 8983
 RUN addgroup -S -g $SOLR_UID $SOLR_USER && \
   adduser -S -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
+ENV SOLR_VERSION 6.3.0
+
 ENV SOLR_KEY 38D2EA16DDF5FC722EBC433FDC92616F177050F6
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$SOLR_KEY"
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
+ENV KEYS https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/KEYS
 
-ENV SOLR_VERSION 6.3.0
 ENV SOLR_SHA256 07692257575fe54ddb8a8f64e96d3d352f2f533aa91b5752be1869d2acf2f544
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
 
 RUN mkdir -p /opt/solr && \
+  wget -nv $KEYS -O /opt/KEYS && \
+  gpg --import /opt/KEYS && \
+  rm /opt/KEYS && \
   echo "downloading $SOLR_URL" && \
   wget -q $SOLR_URL -O /opt/solr.tgz && \
   echo "downloading $SOLR_URL.asc" && \
diff --git a/solr_6.3-alpine/scripts/init-solr-home b/solr_6.3-alpine/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_6.3-alpine/scripts/init-solr-home
+++ b/solr_6.3-alpine/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents
diff --git a/solr_6.3/Dockerfile b/solr_6.3/Dockerfile
index d429ac7..5999b12 100644
--- a/solr_6.3/Dockerfile
+++ b/solr_6.3/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apt-get update && \
   apt-get -y install lsof && \
   rm -rf /var/lib/apt/lists/*
@@ -20,15 +16,18 @@ ENV SOLR_UID 8983
 RUN groupadd -r -g $SOLR_UID $SOLR_USER && \
   useradd -r -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
+ENV SOLR_VERSION 6.3.0
+
 ENV SOLR_KEY 38D2EA16DDF5FC722EBC433FDC92616F177050F6
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
+ENV KEYS https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/KEYS
 
-ENV SOLR_VERSION 6.3.0
 ENV SOLR_SHA256 07692257575fe54ddb8a8f64e96d3d352f2f533aa91b5752be1869d2acf2f544
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
 
 RUN mkdir -p /opt/solr && \
+  wget -nv $KEYS -O /opt/KEYS && \
+  gpg --import /opt/KEYS && \
+  rm /opt/KEYS && \
   wget -nv $SOLR_URL -O /opt/solr.tgz && \
   wget -nv $SOLR_URL.asc -O /opt/solr.tgz.asc && \
   echo "$SOLR_SHA256 */opt/solr.tgz" | sha256sum -c - && \
diff --git a/solr_6.3/scripts/init-solr-home b/solr_6.3/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_6.3/scripts/init-solr-home
+++ b/solr_6.3/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents
diff --git a/solr_6.3/scripts/solr-foreground b/solr_6.3/scripts/solr-foreground
index 9db8281..00e16bd 100755
--- a/solr_6.3/scripts/solr-foreground
+++ b/solr_6.3/scripts/solr-foreground
@@ -8,5 +8,5 @@ if [[ "$VERBOSE" = "yes" ]]; then
 fi
 
 . /opt/docker-solr/scripts/run-initdb
-export
+
 exec solr -f "$@"
diff --git a/solr_alpine/Dockerfile b/solr_alpine/Dockerfile
index c4d264c..11fa1f1 100644
--- a/solr_alpine/Dockerfile
+++ b/solr_alpine/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apk add --no-cache \
         lsof \
         gnupg \
@@ -25,16 +21,18 @@ ENV SOLR_UID 8983
 RUN addgroup -S -g $SOLR_UID $SOLR_USER && \
   adduser -S -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY E6E21FFCDCEA14C95910EA65051A0FAF76BC6507
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$SOLR_KEY"
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
+ENV SOLR_VERSION 6.4.2
+
+ENV SOLR_KEY 2085660D9C1FCCACC4A479A3BF160FF14992A24C
+ENV KEYS https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/KEYS
 
-ENV SOLR_VERSION 6.4.1
-ENV SOLR_SHA256 ebce206dd4a66600384ccdd9a604536135594ce4c24814bbd5a3e8a8ec1efbb9
+ENV SOLR_SHA256 354e1affd9cad7d6e86cde8c03aaeb604876f0764129621d8e231cdb35b31c55
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
 
 RUN mkdir -p /opt/solr && \
+  wget -nv $KEYS -O /opt/KEYS && \
+  gpg --import /opt/KEYS && \
+  rm /opt/KEYS && \
   echo "downloading $SOLR_URL" && \
   wget -q $SOLR_URL -O /opt/solr.tgz && \
   echo "downloading $SOLR_URL.asc" && \
diff --git a/solr_alpine/scripts/init-solr-home b/solr_alpine/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_alpine/scripts/init-solr-home
+++ b/solr_alpine/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents
diff --git a/solr_latest/Dockerfile b/solr_latest/Dockerfile
index 8bfcfe3..6787803 100644
--- a/solr_latest/Dockerfile
+++ b/solr_latest/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apt-get update && \
   apt-get -y install lsof && \
   rm -rf /var/lib/apt/lists/*
@@ -20,15 +16,18 @@ ENV SOLR_UID 8983
 RUN groupadd -r -g $SOLR_UID $SOLR_USER && \
   useradd -r -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY E6E21FFCDCEA14C95910EA65051A0FAF76BC6507
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
+ENV SOLR_VERSION 6.4.2
+
+ENV SOLR_KEY 2085660D9C1FCCACC4A479A3BF160FF14992A24C
+ENV KEYS https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/KEYS
 
-ENV SOLR_VERSION 6.4.1
-ENV SOLR_SHA256 ebce206dd4a66600384ccdd9a604536135594ce4c24814bbd5a3e8a8ec1efbb9
+ENV SOLR_SHA256 354e1affd9cad7d6e86cde8c03aaeb604876f0764129621d8e231cdb35b31c55
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
 
 RUN mkdir -p /opt/solr && \
+  wget -nv $KEYS -O /opt/KEYS && \
+  gpg --import /opt/KEYS && \
+  rm /opt/KEYS && \
   wget -nv $SOLR_URL -O /opt/solr.tgz && \
   wget -nv $SOLR_URL.asc -O /opt/solr.tgz.asc && \
   echo "$SOLR_SHA256 */opt/solr.tgz" | sha256sum -c - && \
diff --git a/solr_latest/scripts/init-solr-home b/solr_latest/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_latest/scripts/init-solr-home
+++ b/solr_latest/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents

@makuk66
Copy link
Contributor Author

makuk66 commented Mar 14, 2017

I've updated with the latest from the discussion in docker-solr/docker-solr#106

@tianon
Copy link
Member

tianon commented Mar 14, 2017

❤️ ❤️ ❤️

warning: insecure protocol git:// detected: git://github.com/docker-solr/docker-solr
diff --git a/_bashbrew-list b/_bashbrew-list
index f4742fb..38f3e4f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,8 +2,8 @@ solr:5
 solr:5-alpine
 solr:5.5
 solr:5.5-alpine
-solr:5.5.3
-solr:5.5.3-alpine
+solr:5.5.4
+solr:5.5.4-alpine
 solr:6
 solr:6-alpine
 solr:6.3
@@ -12,7 +12,7 @@ solr:6.3.0
 solr:6.3.0-alpine
 solr:6.4
 solr:6.4-alpine
-solr:6.4.1
-solr:6.4.1-alpine
+solr:6.4.2
+solr:6.4.2-alpine
 solr:alpine
 solr:latest
diff --git a/solr_5-alpine/Dockerfile b/solr_5-alpine/Dockerfile
index 8fff3fb..ace1796 100644
--- a/solr_5-alpine/Dockerfile
+++ b/solr_5-alpine/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apk add --no-cache \
         lsof \
         gnupg \
@@ -25,14 +21,25 @@ ENV SOLR_UID 8983
 RUN addgroup -S -g $SOLR_UID $SOLR_USER && \
   adduser -S -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY EDF961FF03E647F9CA8A9C2C758051CCA3A13A7F
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$SOLR_KEY"
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
-
-ENV SOLR_VERSION 5.5.3
-ENV SOLR_SHA256 74e8a924dac0e073854af121a6de9d58fe8cc315d16b57e17f429c6a91b0b065
+ENV SOLR_VERSION 5.5.4
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
+ENV SOLR_SHA256 c1528e4afc9a0b8e7e5be0a16f40bb4080f410d502cd63b4447d448c49e9f500
+ENV SOLR_KEYS E6E21FFCDCEA14C95910EA65051A0FAF76BC6507
+
+RUN set -e; for key in $SOLR_KEYS; do \
+    found=''; \
+    for server in \
+      ha.pool.sks-keyservers.net \
+      hkp://keyserver.ubuntu.com:80 \
+      hkp://p80.pool.sks-keyservers.net:80 \
+      pgp.mit.edu \
+    ; do \
+      echo "  trying $server for $key"; \
+      gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+    done; \
+    test -z "$found" && echo >&2 "error: failed to fetch $key from several disparate servers -- network issues?" && exit 1; \
+  done; \
+  exit 0
 
 RUN mkdir -p /opt/solr && \
   echo "downloading $SOLR_URL" && \
diff --git a/solr_5-alpine/scripts/init-solr-home b/solr_5-alpine/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_5-alpine/scripts/init-solr-home
+++ b/solr_5-alpine/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents
diff --git a/solr_5/Dockerfile b/solr_5/Dockerfile
index 7b891da..60419a8 100644
--- a/solr_5/Dockerfile
+++ b/solr_5/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apt-get update && \
   apt-get -y install lsof && \
   rm -rf /var/lib/apt/lists/*
@@ -20,13 +16,25 @@ ENV SOLR_UID 8983
 RUN groupadd -r -g $SOLR_UID $SOLR_USER && \
   useradd -r -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY EDF961FF03E647F9CA8A9C2C758051CCA3A13A7F
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
-
-ENV SOLR_VERSION 5.5.3
-ENV SOLR_SHA256 74e8a924dac0e073854af121a6de9d58fe8cc315d16b57e17f429c6a91b0b065
+ENV SOLR_VERSION 5.5.4
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
+ENV SOLR_SHA256 c1528e4afc9a0b8e7e5be0a16f40bb4080f410d502cd63b4447d448c49e9f500
+ENV SOLR_KEYS E6E21FFCDCEA14C95910EA65051A0FAF76BC6507
+
+RUN set -e; for key in $SOLR_KEYS; do \
+    found=''; \
+    for server in \
+      ha.pool.sks-keyservers.net \
+      hkp://keyserver.ubuntu.com:80 \
+      hkp://p80.pool.sks-keyservers.net:80 \
+      pgp.mit.edu \
+    ; do \
+      echo "  trying $server for $key"; \
+      gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+    done; \
+    test -z "$found" && echo >&2 "error: failed to fetch $key from several disparate servers -- network issues?" && exit 1; \
+  done; \
+  exit 0
 
 RUN mkdir -p /opt/solr && \
   wget -nv $SOLR_URL -O /opt/solr.tgz && \
diff --git a/solr_5/scripts/init-solr-home b/solr_5/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_5/scripts/init-solr-home
+++ b/solr_5/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents
diff --git a/solr_6.3-alpine/Dockerfile b/solr_6.3-alpine/Dockerfile
index 50e30d3..a560397 100644
--- a/solr_6.3-alpine/Dockerfile
+++ b/solr_6.3-alpine/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apk add --no-cache \
         lsof \
         gnupg \
@@ -25,14 +21,25 @@ ENV SOLR_UID 8983
 RUN addgroup -S -g $SOLR_UID $SOLR_USER && \
   adduser -S -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY 38D2EA16DDF5FC722EBC433FDC92616F177050F6
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$SOLR_KEY"
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
-
 ENV SOLR_VERSION 6.3.0
-ENV SOLR_SHA256 07692257575fe54ddb8a8f64e96d3d352f2f533aa91b5752be1869d2acf2f544
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
+ENV SOLR_SHA256 07692257575fe54ddb8a8f64e96d3d352f2f533aa91b5752be1869d2acf2f544
+ENV SOLR_KEYS 38D2EA16DDF5FC722EBC433FDC92616F177050F6
+
+RUN set -e; for key in $SOLR_KEYS; do \
+    found=''; \
+    for server in \
+      ha.pool.sks-keyservers.net \
+      hkp://keyserver.ubuntu.com:80 \
+      hkp://p80.pool.sks-keyservers.net:80 \
+      pgp.mit.edu \
+    ; do \
+      echo "  trying $server for $key"; \
+      gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+    done; \
+    test -z "$found" && echo >&2 "error: failed to fetch $key from several disparate servers -- network issues?" && exit 1; \
+  done; \
+  exit 0
 
 RUN mkdir -p /opt/solr && \
   echo "downloading $SOLR_URL" && \
diff --git a/solr_6.3-alpine/scripts/init-solr-home b/solr_6.3-alpine/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_6.3-alpine/scripts/init-solr-home
+++ b/solr_6.3-alpine/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents
diff --git a/solr_6.3/Dockerfile b/solr_6.3/Dockerfile
index d429ac7..3d06910 100644
--- a/solr_6.3/Dockerfile
+++ b/solr_6.3/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apt-get update && \
   apt-get -y install lsof && \
   rm -rf /var/lib/apt/lists/*
@@ -20,13 +16,25 @@ ENV SOLR_UID 8983
 RUN groupadd -r -g $SOLR_UID $SOLR_USER && \
   useradd -r -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY 38D2EA16DDF5FC722EBC433FDC92616F177050F6
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
-
 ENV SOLR_VERSION 6.3.0
-ENV SOLR_SHA256 07692257575fe54ddb8a8f64e96d3d352f2f533aa91b5752be1869d2acf2f544
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
+ENV SOLR_SHA256 07692257575fe54ddb8a8f64e96d3d352f2f533aa91b5752be1869d2acf2f544
+ENV SOLR_KEYS 38D2EA16DDF5FC722EBC433FDC92616F177050F6
+
+RUN set -e; for key in $SOLR_KEYS; do \
+    found=''; \
+    for server in \
+      ha.pool.sks-keyservers.net \
+      hkp://keyserver.ubuntu.com:80 \
+      hkp://p80.pool.sks-keyservers.net:80 \
+      pgp.mit.edu \
+    ; do \
+      echo "  trying $server for $key"; \
+      gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+    done; \
+    test -z "$found" && echo >&2 "error: failed to fetch $key from several disparate servers -- network issues?" && exit 1; \
+  done; \
+  exit 0
 
 RUN mkdir -p /opt/solr && \
   wget -nv $SOLR_URL -O /opt/solr.tgz && \
diff --git a/solr_6.3/scripts/init-solr-home b/solr_6.3/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_6.3/scripts/init-solr-home
+++ b/solr_6.3/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents
diff --git a/solr_6.3/scripts/solr-foreground b/solr_6.3/scripts/solr-foreground
index 9db8281..00e16bd 100755
--- a/solr_6.3/scripts/solr-foreground
+++ b/solr_6.3/scripts/solr-foreground
@@ -8,5 +8,5 @@ if [[ "$VERBOSE" = "yes" ]]; then
 fi
 
 . /opt/docker-solr/scripts/run-initdb
-export
+
 exec solr -f "$@"
diff --git a/solr_alpine/Dockerfile b/solr_alpine/Dockerfile
index c4d264c..0c0d1b3 100644
--- a/solr_alpine/Dockerfile
+++ b/solr_alpine/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apk add --no-cache \
         lsof \
         gnupg \
@@ -25,14 +21,25 @@ ENV SOLR_UID 8983
 RUN addgroup -S -g $SOLR_UID $SOLR_USER && \
   adduser -S -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY E6E21FFCDCEA14C95910EA65051A0FAF76BC6507
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$SOLR_KEY"
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
-
-ENV SOLR_VERSION 6.4.1
-ENV SOLR_SHA256 ebce206dd4a66600384ccdd9a604536135594ce4c24814bbd5a3e8a8ec1efbb9
+ENV SOLR_VERSION 6.4.2
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
+ENV SOLR_SHA256 354e1affd9cad7d6e86cde8c03aaeb604876f0764129621d8e231cdb35b31c55
+ENV SOLR_KEYS 2085660D9C1FCCACC4A479A3BF160FF14992A24C
+
+RUN set -e; for key in $SOLR_KEYS; do \
+    found=''; \
+    for server in \
+      ha.pool.sks-keyservers.net \
+      hkp://keyserver.ubuntu.com:80 \
+      hkp://p80.pool.sks-keyservers.net:80 \
+      pgp.mit.edu \
+    ; do \
+      echo "  trying $server for $key"; \
+      gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+    done; \
+    test -z "$found" && echo >&2 "error: failed to fetch $key from several disparate servers -- network issues?" && exit 1; \
+  done; \
+  exit 0
 
 RUN mkdir -p /opt/solr && \
   echo "downloading $SOLR_URL" && \
diff --git a/solr_alpine/scripts/init-solr-home b/solr_alpine/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_alpine/scripts/init-solr-home
+++ b/solr_alpine/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents
diff --git a/solr_latest/Dockerfile b/solr_latest/Dockerfile
index 8bfcfe3..187d8f3 100644
--- a/solr_latest/Dockerfile
+++ b/solr_latest/Dockerfile
@@ -6,10 +6,6 @@ MAINTAINER  Martijn Koster "mak-docker@greenhills.co.uk"
 #   docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
 ARG SOLR_DOWNLOAD_SERVER
 
-# Override the GPG keyserver with e.g.:
-#   docker build -t mine --build-arg GPG_KEYSERVER=hkp://eu.pool.sks-keyservers.net .
-ARG GPG_KEYSERVER
-
 RUN apt-get update && \
   apt-get -y install lsof && \
   rm -rf /var/lib/apt/lists/*
@@ -20,13 +16,25 @@ ENV SOLR_UID 8983
 RUN groupadd -r -g $SOLR_UID $SOLR_USER && \
   useradd -r -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY E6E21FFCDCEA14C95910EA65051A0FAF76BC6507
-ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
-RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
-
-ENV SOLR_VERSION 6.4.1
-ENV SOLR_SHA256 ebce206dd4a66600384ccdd9a604536135594ce4c24814bbd5a3e8a8ec1efbb9
+ENV SOLR_VERSION 6.4.2
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
+ENV SOLR_SHA256 354e1affd9cad7d6e86cde8c03aaeb604876f0764129621d8e231cdb35b31c55
+ENV SOLR_KEYS 2085660D9C1FCCACC4A479A3BF160FF14992A24C
+
+RUN set -e; for key in $SOLR_KEYS; do \
+    found=''; \
+    for server in \
+      ha.pool.sks-keyservers.net \
+      hkp://keyserver.ubuntu.com:80 \
+      hkp://p80.pool.sks-keyservers.net:80 \
+      pgp.mit.edu \
+    ; do \
+      echo "  trying $server for $key"; \
+      gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+    done; \
+    test -z "$found" && echo >&2 "error: failed to fetch $key from several disparate servers -- network issues?" && exit 1; \
+  done; \
+  exit 0
 
 RUN mkdir -p /opt/solr && \
   wget -nv $SOLR_URL -O /opt/solr.tgz && \
diff --git a/solr_latest/scripts/init-solr-home b/solr_latest/scripts/init-solr-home
index afbcfc8..9e4f507 100755
--- a/solr_latest/scripts/init-solr-home
+++ b/solr_latest/scripts/init-solr-home
@@ -33,9 +33,15 @@ if [ ! -d "$SOLR_HOME" ]; then
     exit 1
 fi
 
-# don't do anything if it is non-empty
+# check for existing Solr
+if [ -f "$SOLR_HOME/solr.xml" ]; then
+   exit
+fi
+
+# refuse to use non-empty directories, which are likely a misconfiguration
 if [ $(find "$SOLR_HOME" -mindepth  1 | wc -l) != '0' ]; then
-    exit
+    echo "SOLR_HOME directory $SOLR_HOME is not empty; refusing to create a solr home."
+    exit 1
 fi
 
 # populate with default solr home contents

@tianon
Copy link
Member

tianon commented Mar 14, 2017

LGTM

Build test of #2729; 7936d92 (solr):
warning: insecure protocol git:// detected: git://github.com/docker-solr/docker-solr

$ bashbrew build solr:5.5.4
Building bashbrew/cache:60fcb54723336e9964d90378b84195246cdf63f38d16f1e7014cf5496722c8e7 (solr:5.5.4)
Tagging solr:5.5.4
Tagging solr:5.5
Tagging solr:5

$ test/run.sh solr:5.5.4
testing solr:5.5.4
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build solr:5.5.4-alpine
Building bashbrew/cache:becb1822aeec94253e72923c6049e4f4445ae84f78acfc5e1daf2d9533d0ce8f (solr:5.5.4-alpine)
Tagging solr:5.5.4-alpine
Tagging solr:5.5-alpine
Tagging solr:5-alpine

$ test/run.sh solr:5.5.4-alpine
testing solr:5.5.4-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build solr:6.3.0
Building bashbrew/cache:d38265f75e22349bdc7d0970413c081c08a8445358ca6367f87a40c136b26212 (solr:6.3.0)
Tagging solr:6.3.0
Tagging solr:6.3

$ test/run.sh solr:6.3.0
testing solr:6.3.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build solr:6.3.0-alpine
Building bashbrew/cache:3eae5bd6330cd6bd69ec8bcee5d9b77d3ebc0ed5470c4129c21f2d0d953ccb77 (solr:6.3.0-alpine)
Tagging solr:6.3.0-alpine
Tagging solr:6.3-alpine

$ test/run.sh solr:6.3.0-alpine
testing solr:6.3.0-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build solr:6.4.2
Building bashbrew/cache:cf872d9cd0b20aa132b583cb59680aa9ea37c9a42c74a512ab1d4c1548a715a1 (solr:6.4.2)
Tagging solr:6.4.2
Tagging solr:6.4
Tagging solr:6
Tagging solr:latest

$ test/run.sh solr:6.4.2
testing solr:6.4.2
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build solr:6.4.2-alpine
Building bashbrew/cache:f42425f3b4a30b3caf99b1cd7c2a72739469ef4293390dca484766d7fedf9e2f (solr:6.4.2-alpine)
Tagging solr:6.4.2-alpine
Tagging solr:6.4-alpine
Tagging solr:6-alpine
Tagging solr:alpine

$ test/run.sh solr:6.4.2-alpine
testing solr:6.4.2-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit 2f93e9b into docker-library:master Mar 14, 2017
@makuk66
Copy link
Contributor Author

makuk66 commented Mar 15, 2017

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants