Add Solr 7.7.0 #5431
Merged
Add Solr 7.7.0 #5431
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tianon
reviewed
Feb 12, 2019
| Directory: 5.5 | ||
|
|
||
| Tags: 5.5.5-alpine, 5.5-alpine, 5-alpine | ||
| Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x | ||
| GitCommit: 9319e4b65c33c47dd5f901daec9d457571294396 | ||
| GitCommit: d61313b443fb798a3a4e873d2255216e7b5c3a69 | ||
| Directory: 5.5/alpine | ||
|
|
||
| Tags: 5.5.5-slim, 5.5-slim, 5-slim |
There was a problem hiding this comment.
Any particular reason to keep so many versions listed here? Removing them here will remove them from the "Supported" section on the Hub readme (and will prevent us from spending cycles rebuilding them on the official build server), but the tags will still be available to users who want them. (See https://github.com/docker-library/official-images#library-definition-files for more detail on this.)
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 16fb022..2cbb12b 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -138,6 +138,26 @@ solr:7.5-slim @ arm64v8
solr:7.5-slim @ i386
solr:7.5-slim @ ppc64le
solr:7.5-slim @ s390x
+solr:7.6 @ amd64
+solr:7.6 @ arm32v5
+solr:7.6 @ arm32v7
+solr:7.6 @ arm64v8
+solr:7.6 @ i386
+solr:7.6 @ ppc64le
+solr:7.6 @ s390x
+solr:7.6-alpine @ amd64
+solr:7.6-alpine @ arm32v6
+solr:7.6-alpine @ arm64v8
+solr:7.6-alpine @ i386
+solr:7.6-alpine @ ppc64le
+solr:7.6-alpine @ s390x
+solr:7.6-slim @ amd64
+solr:7.6-slim @ arm32v5
+solr:7.6-slim @ arm32v7
+solr:7.6-slim @ arm64v8
+solr:7.6-slim @ i386
+solr:7.6-slim @ ppc64le
+solr:7.6-slim @ s390x
solr:alpine @ amd64
solr:alpine @ arm32v6
solr:alpine @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index e8fe673..05567f7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -55,6 +55,12 @@ solr:7.6-slim
solr:7.6.0
solr:7.6.0-alpine
solr:7.6.0-slim
+solr:7.7
+solr:7.7-alpine
+solr:7.7-slim
+solr:7.7.0
+solr:7.7.0-alpine
+solr:7.7.0-slim
solr:alpine
solr:latest
solr:slim
diff --git a/solr_5-alpine/Dockerfile b/solr_5-alpine/Dockerfile
index 9d541e1..a92abaf 100644
--- a/solr_5-alpine/Dockerfile
+++ b/solr_5-alpine/Dockerfile
@@ -1,6 +1,8 @@
FROM openjdk:8-jre-alpine
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
@@ -25,7 +27,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="5F55943E13D49059D3F342777186B06E1ED139E7" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN addgroup -S -g $SOLR_GID $SOLR_GROUP && \
@@ -35,6 +37,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -45,6 +48,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -74,10 +78,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_5-slim/Dockerfile b/solr_5-slim/Dockerfile
index 32b1c8d..ce77c74 100644
--- a/solr_5-slim/Dockerfile
+++ b/solr_5-slim/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:8-jre-slim
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="5F55943E13D49059D3F342777186B06E1ED139E7" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_5/Dockerfile b/solr_5/Dockerfile
index acaa44b..b6aad0a 100644
--- a/solr_5/Dockerfile
+++ b/solr_5/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:8-jre
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="5F55943E13D49059D3F342777186B06E1ED139E7" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_6-alpine/Dockerfile b/solr_6-alpine/Dockerfile
index 4dfcf5a..8a14fa5 100644
--- a/solr_6-alpine/Dockerfile
+++ b/solr_6-alpine/Dockerfile
@@ -1,6 +1,8 @@
FROM openjdk:8-jre-alpine
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
@@ -25,7 +27,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="2085660D9C1FCCACC4A479A3BF160FF14992A24C" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN addgroup -S -g $SOLR_GID $SOLR_GROUP && \
@@ -35,6 +37,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -45,6 +48,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -74,10 +78,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_6-slim/Dockerfile b/solr_6-slim/Dockerfile
index a2d037d..de9f9bd 100644
--- a/solr_6-slim/Dockerfile
+++ b/solr_6-slim/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:8-jre-slim
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="2085660D9C1FCCACC4A479A3BF160FF14992A24C" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_6/Dockerfile b/solr_6/Dockerfile
index 2bc4ce8..9381988 100644
--- a/solr_6/Dockerfile
+++ b/solr_6/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:8-jre
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="2085660D9C1FCCACC4A479A3BF160FF14992A24C" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.1-alpine/Dockerfile b/solr_7.1-alpine/Dockerfile
index 1a38241..74b405b 100644
--- a/solr_7.1-alpine/Dockerfile
+++ b/solr_7.1-alpine/Dockerfile
@@ -1,6 +1,8 @@
FROM openjdk:8-jre-alpine
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
@@ -25,7 +27,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="38D2EA16DDF5FC722EBC433FDC92616F177050F6" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN addgroup -S -g $SOLR_GID $SOLR_GROUP && \
@@ -35,6 +37,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -45,6 +48,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -74,10 +78,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.1-slim/Dockerfile b/solr_7.1-slim/Dockerfile
index 4ccb791..4660682 100644
--- a/solr_7.1-slim/Dockerfile
+++ b/solr_7.1-slim/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:8-jre-slim
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="38D2EA16DDF5FC722EBC433FDC92616F177050F6" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.1/Dockerfile b/solr_7.1/Dockerfile
index 5094263..b6c82ea 100644
--- a/solr_7.1/Dockerfile
+++ b/solr_7.1/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:8-jre
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="38D2EA16DDF5FC722EBC433FDC92616F177050F6" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.2-alpine/Dockerfile b/solr_7.2-alpine/Dockerfile
index 0f1d4f9..6dbbb2a 100644
--- a/solr_7.2-alpine/Dockerfile
+++ b/solr_7.2-alpine/Dockerfile
@@ -1,6 +1,8 @@
FROM openjdk:8-jre-alpine
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
@@ -25,7 +27,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="052C5B48A480B9CEA9E218A5F98C13CFA5A135D8" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN addgroup -S -g $SOLR_GID $SOLR_GROUP && \
@@ -35,6 +37,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -45,6 +48,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -74,10 +78,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.2-slim/Dockerfile b/solr_7.2-slim/Dockerfile
index a767e8f..0492f1c 100644
--- a/solr_7.2-slim/Dockerfile
+++ b/solr_7.2-slim/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:8-jre-slim
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="052C5B48A480B9CEA9E218A5F98C13CFA5A135D8" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.2/Dockerfile b/solr_7.2/Dockerfile
index f4ea1af..1b9e025 100644
--- a/solr_7.2/Dockerfile
+++ b/solr_7.2/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:8-jre
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="052C5B48A480B9CEA9E218A5F98C13CFA5A135D8" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.3-alpine/Dockerfile b/solr_7.3-alpine/Dockerfile
index d2cb382..dd83d0f 100644
--- a/solr_7.3-alpine/Dockerfile
+++ b/solr_7.3-alpine/Dockerfile
@@ -1,6 +1,8 @@
FROM openjdk:8-jre-alpine
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
@@ -25,7 +27,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="A72C08F85D7666C3980C35DD1A3859BBABBDB295" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN addgroup -S -g $SOLR_GID $SOLR_GROUP && \
@@ -35,6 +37,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -45,6 +48,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -74,10 +78,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.3-slim/Dockerfile b/solr_7.3-slim/Dockerfile
index dadff88..fb31d37 100644
--- a/solr_7.3-slim/Dockerfile
+++ b/solr_7.3-slim/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:11-jre-slim
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="A72C08F85D7666C3980C35DD1A3859BBABBDB295" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.3/Dockerfile b/solr_7.3/Dockerfile
index 85cbfef..695216a 100644
--- a/solr_7.3/Dockerfile
+++ b/solr_7.3/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:11-jre
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="A72C08F85D7666C3980C35DD1A3859BBABBDB295" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.4-alpine/Dockerfile b/solr_7.4-alpine/Dockerfile
index 839d653..c964e76 100644
--- a/solr_7.4-alpine/Dockerfile
+++ b/solr_7.4-alpine/Dockerfile
@@ -1,6 +1,8 @@
FROM openjdk:8-jre-alpine
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
@@ -25,7 +27,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="E6E21FFCDCEA14C95910EA65051A0FAF76BC6507" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN addgroup -S -g $SOLR_GID $SOLR_GROUP && \
@@ -35,6 +37,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -45,6 +48,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -74,10 +78,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.4-slim/Dockerfile b/solr_7.4-slim/Dockerfile
index dac6cb4..f1d3a1a 100644
--- a/solr_7.4-slim/Dockerfile
+++ b/solr_7.4-slim/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:11-jre-slim
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="E6E21FFCDCEA14C95910EA65051A0FAF76BC6507" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.4/Dockerfile b/solr_7.4/Dockerfile
index a420d50..b2f8c63 100644
--- a/solr_7.4/Dockerfile
+++ b/solr_7.4/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:11-jre
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="E6E21FFCDCEA14C95910EA65051A0FAF76BC6507" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.5-alpine/Dockerfile b/solr_7.5-alpine/Dockerfile
index ea9daac..f8adef6 100644
--- a/solr_7.5-alpine/Dockerfile
+++ b/solr_7.5-alpine/Dockerfile
@@ -1,6 +1,8 @@
FROM openjdk:8-jre-alpine
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
@@ -25,7 +27,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="052C5B48A480B9CEA9E218A5F98C13CFA5A135D8" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN addgroup -S -g $SOLR_GID $SOLR_GROUP && \
@@ -35,6 +37,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -45,6 +48,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -74,10 +78,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.5-slim/Dockerfile b/solr_7.5-slim/Dockerfile
index b8f25a9..21c52ee 100644
--- a/solr_7.5-slim/Dockerfile
+++ b/solr_7.5-slim/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:11-jre-slim
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="052C5B48A480B9CEA9E218A5F98C13CFA5A135D8" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_7.5/Dockerfile b/solr_7.5/Dockerfile
index 914a92c..706a59c 100644
--- a/solr_7.5/Dockerfile
+++ b/solr_7.5/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:11-jre
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="052C5B48A480B9CEA9E218A5F98C13CFA5A135D8" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_alpine/Dockerfile b/solr_7.6-alpine/Dockerfile
similarity index 87%
copy from solr_alpine/Dockerfile
copy to solr_7.6-alpine/Dockerfile
index 72309e8..0bafec0 100644
--- a/solr_alpine/Dockerfile
+++ b/solr_7.6-alpine/Dockerfile
@@ -1,6 +1,8 @@
FROM openjdk:8-jre-alpine
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
@@ -25,7 +27,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="95B01F0E78111D63D331C1A751F0CC22F625308A" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN addgroup -S -g $SOLR_GID $SOLR_GROUP && \
@@ -35,6 +37,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -45,6 +48,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -74,10 +78,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_5-alpine/scripts/docker-entrypoint.sh b/solr_7.6-alpine/scripts/docker-entrypoint.sh
similarity index 100%
copy from solr_5-alpine/scripts/docker-entrypoint.sh
copy to solr_7.6-alpine/scripts/docker-entrypoint.sh
diff --git a/solr_5-alpine/scripts/init-solr-home b/solr_7.6-alpine/scripts/init-solr-home
similarity index 100%
copy from solr_5-alpine/scripts/init-solr-home
copy to solr_7.6-alpine/scripts/init-solr-home
diff --git a/solr_5-alpine/scripts/precreate-core b/solr_7.6-alpine/scripts/precreate-core
similarity index 100%
copy from solr_5-alpine/scripts/precreate-core
copy to solr_7.6-alpine/scripts/precreate-core
diff --git a/solr_5-alpine/scripts/run-initdb b/solr_7.6-alpine/scripts/run-initdb
similarity index 100%
copy from solr_5-alpine/scripts/run-initdb
copy to solr_7.6-alpine/scripts/run-initdb
diff --git a/solr_5-alpine/scripts/solr-create b/solr_7.6-alpine/scripts/solr-create
similarity index 100%
copy from solr_5-alpine/scripts/solr-create
copy to solr_7.6-alpine/scripts/solr-create
diff --git a/solr_5-alpine/scripts/solr-demo b/solr_7.6-alpine/scripts/solr-demo
similarity index 100%
copy from solr_5-alpine/scripts/solr-demo
copy to solr_7.6-alpine/scripts/solr-demo
diff --git a/solr_5-alpine/scripts/solr-foreground b/solr_7.6-alpine/scripts/solr-foreground
similarity index 100%
copy from solr_5-alpine/scripts/solr-foreground
copy to solr_7.6-alpine/scripts/solr-foreground
diff --git a/solr_5-alpine/scripts/solr-precreate b/solr_7.6-alpine/scripts/solr-precreate
similarity index 100%
copy from solr_5-alpine/scripts/solr-precreate
copy to solr_7.6-alpine/scripts/solr-precreate
diff --git a/solr_5-alpine/scripts/start-local-solr b/solr_7.6-alpine/scripts/start-local-solr
similarity index 100%
copy from solr_5-alpine/scripts/start-local-solr
copy to solr_7.6-alpine/scripts/start-local-solr
diff --git a/solr_5-alpine/scripts/stop-local-solr b/solr_7.6-alpine/scripts/stop-local-solr
similarity index 100%
copy from solr_5-alpine/scripts/stop-local-solr
copy to solr_7.6-alpine/scripts/stop-local-solr
diff --git a/solr_5-alpine/scripts/wait-for-solr.sh b/solr_7.6-alpine/scripts/wait-for-solr.sh
similarity index 100%
copy from solr_5-alpine/scripts/wait-for-solr.sh
copy to solr_7.6-alpine/scripts/wait-for-solr.sh
diff --git a/solr_slim/Dockerfile b/solr_7.6-slim/Dockerfile
similarity index 85%
copy from solr_slim/Dockerfile
copy to solr_7.6-slim/Dockerfile
index bcb1a81..f8bec6e 100644
--- a/solr_slim/Dockerfile
+++ b/solr_7.6-slim/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:11-jre-slim
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="95B01F0E78111D63D331C1A751F0CC22F625308A" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_5-alpine/scripts/docker-entrypoint.sh b/solr_7.6-slim/scripts/docker-entrypoint.sh
similarity index 100%
copy from solr_5-alpine/scripts/docker-entrypoint.sh
copy to solr_7.6-slim/scripts/docker-entrypoint.sh
diff --git a/solr_5-alpine/scripts/init-solr-home b/solr_7.6-slim/scripts/init-solr-home
similarity index 100%
copy from solr_5-alpine/scripts/init-solr-home
copy to solr_7.6-slim/scripts/init-solr-home
diff --git a/solr_5-alpine/scripts/precreate-core b/solr_7.6-slim/scripts/precreate-core
similarity index 100%
copy from solr_5-alpine/scripts/precreate-core
copy to solr_7.6-slim/scripts/precreate-core
diff --git a/solr_5-alpine/scripts/run-initdb b/solr_7.6-slim/scripts/run-initdb
similarity index 100%
copy from solr_5-alpine/scripts/run-initdb
copy to solr_7.6-slim/scripts/run-initdb
diff --git a/solr_5-alpine/scripts/solr-create b/solr_7.6-slim/scripts/solr-create
similarity index 100%
copy from solr_5-alpine/scripts/solr-create
copy to solr_7.6-slim/scripts/solr-create
diff --git a/solr_5-alpine/scripts/solr-demo b/solr_7.6-slim/scripts/solr-demo
similarity index 100%
copy from solr_5-alpine/scripts/solr-demo
copy to solr_7.6-slim/scripts/solr-demo
diff --git a/solr_5-alpine/scripts/solr-foreground b/solr_7.6-slim/scripts/solr-foreground
similarity index 100%
copy from solr_5-alpine/scripts/solr-foreground
copy to solr_7.6-slim/scripts/solr-foreground
diff --git a/solr_5-alpine/scripts/solr-precreate b/solr_7.6-slim/scripts/solr-precreate
similarity index 100%
copy from solr_5-alpine/scripts/solr-precreate
copy to solr_7.6-slim/scripts/solr-precreate
diff --git a/solr_5-alpine/scripts/start-local-solr b/solr_7.6-slim/scripts/start-local-solr
similarity index 100%
copy from solr_5-alpine/scripts/start-local-solr
copy to solr_7.6-slim/scripts/start-local-solr
diff --git a/solr_5-alpine/scripts/stop-local-solr b/solr_7.6-slim/scripts/stop-local-solr
similarity index 100%
copy from solr_5-alpine/scripts/stop-local-solr
copy to solr_7.6-slim/scripts/stop-local-solr
diff --git a/solr_5-alpine/scripts/wait-for-solr.sh b/solr_7.6-slim/scripts/wait-for-solr.sh
similarity index 100%
copy from solr_5-alpine/scripts/wait-for-solr.sh
copy to solr_7.6-slim/scripts/wait-for-solr.sh
diff --git a/solr_latest/Dockerfile b/solr_7.6/Dockerfile
similarity index 85%
copy from solr_latest/Dockerfile
copy to solr_7.6/Dockerfile
index ec48e8e..c4d1d87 100644
--- a/solr_latest/Dockerfile
+++ b/solr_7.6/Dockerfile
@@ -1,13 +1,15 @@
FROM openjdk:11-jre
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
@@ -20,7 +22,7 @@ ENV SOLR_USER="solr" \
SOLR_KEYS="95B01F0E78111D63D331C1A751F0CC22F625308A" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_5-alpine/scripts/docker-entrypoint.sh b/solr_7.6/scripts/docker-entrypoint.sh
similarity index 100%
copy from solr_5-alpine/scripts/docker-entrypoint.sh
copy to solr_7.6/scripts/docker-entrypoint.sh
diff --git a/solr_5-alpine/scripts/init-solr-home b/solr_7.6/scripts/init-solr-home
similarity index 100%
copy from solr_5-alpine/scripts/init-solr-home
copy to solr_7.6/scripts/init-solr-home
diff --git a/solr_5-alpine/scripts/precreate-core b/solr_7.6/scripts/precreate-core
similarity index 100%
copy from solr_5-alpine/scripts/precreate-core
copy to solr_7.6/scripts/precreate-core
diff --git a/solr_5-alpine/scripts/run-initdb b/solr_7.6/scripts/run-initdb
similarity index 100%
copy from solr_5-alpine/scripts/run-initdb
copy to solr_7.6/scripts/run-initdb
diff --git a/solr_5-alpine/scripts/solr-create b/solr_7.6/scripts/solr-create
similarity index 100%
copy from solr_5-alpine/scripts/solr-create
copy to solr_7.6/scripts/solr-create
diff --git a/solr_5-alpine/scripts/solr-demo b/solr_7.6/scripts/solr-demo
similarity index 100%
copy from solr_5-alpine/scripts/solr-demo
copy to solr_7.6/scripts/solr-demo
diff --git a/solr_5-alpine/scripts/solr-foreground b/solr_7.6/scripts/solr-foreground
similarity index 100%
copy from solr_5-alpine/scripts/solr-foreground
copy to solr_7.6/scripts/solr-foreground
diff --git a/solr_5-alpine/scripts/solr-precreate b/solr_7.6/scripts/solr-precreate
similarity index 100%
copy from solr_5-alpine/scripts/solr-precreate
copy to solr_7.6/scripts/solr-precreate
diff --git a/solr_5-alpine/scripts/start-local-solr b/solr_7.6/scripts/start-local-solr
similarity index 100%
copy from solr_5-alpine/scripts/start-local-solr
copy to solr_7.6/scripts/start-local-solr
diff --git a/solr_5-alpine/scripts/stop-local-solr b/solr_7.6/scripts/stop-local-solr
similarity index 100%
copy from solr_5-alpine/scripts/stop-local-solr
copy to solr_7.6/scripts/stop-local-solr
diff --git a/solr_5-alpine/scripts/wait-for-solr.sh b/solr_7.6/scripts/wait-for-solr.sh
similarity index 100%
copy from solr_5-alpine/scripts/wait-for-solr.sh
copy to solr_7.6/scripts/wait-for-solr.sh
diff --git a/solr_alpine/Dockerfile b/solr_alpine/Dockerfile
index 72309e8..15f0e09 100644
--- a/solr_alpine/Dockerfile
+++ b/solr_alpine/Dockerfile
@@ -1,6 +1,8 @@
FROM openjdk:8-jre-alpine
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
@@ -19,13 +21,13 @@ ENV SOLR_USER="solr" \
SOLR_UID="8983" \
SOLR_GROUP="solr" \
SOLR_GID="8983" \
- SOLR_VERSION="7.6.0" \
- SOLR_URL="${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/7.6.0/solr-7.6.0.tgz" \
- SOLR_SHA256="2cb425a0b30ff153465d306803e514e53e41924d74f28d842cb3a07cace759d5" \
- SOLR_KEYS="95B01F0E78111D63D331C1A751F0CC22F625308A" \
+ SOLR_VERSION="7.7.0" \
+ SOLR_URL="${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/7.7.0/solr-7.7.0.tgz" \
+ SOLR_SHA256="ad9eaa29449701fcabad497cc5f0506f8a8f76da714dc4a5429a549fcac24dc7" \
+ SOLR_KEYS="052C5B48A480B9CEA9E218A5F98C13CFA5A135D8" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN addgroup -S -g $SOLR_GID $SOLR_GROUP && \
@@ -35,6 +37,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -45,6 +48,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -74,10 +78,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_latest/Dockerfile b/solr_latest/Dockerfile
index ec48e8e..0341b62 100644
--- a/solr_latest/Dockerfile
+++ b/solr_latest/Dockerfile
@@ -1,26 +1,28 @@
FROM openjdk:11-jre
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
SOLR_UID="8983" \
SOLR_GROUP="solr" \
SOLR_GID="8983" \
- SOLR_VERSION="7.6.0" \
- SOLR_URL="${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/7.6.0/solr-7.6.0.tgz" \
- SOLR_SHA256="2cb425a0b30ff153465d306803e514e53e41924d74f28d842cb3a07cace759d5" \
- SOLR_KEYS="95B01F0E78111D63D331C1A751F0CC22F625308A" \
+ SOLR_VERSION="7.7.0" \
+ SOLR_URL="${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/7.7.0/solr-7.7.0.tgz" \
+ SOLR_SHA256="ad9eaa29449701fcabad497cc5f0506f8a8f76da714dc4a5429a549fcac24dc7" \
+ SOLR_KEYS="052C5B48A480B9CEA9E218A5F98C13CFA5A135D8" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr
diff --git a/solr_slim/Dockerfile b/solr_slim/Dockerfile
index bcb1a81..91ad9ae 100644
--- a/solr_slim/Dockerfile
+++ b/solr_slim/Dockerfile
@@ -1,26 +1,28 @@
FROM openjdk:11-jre-slim
-MAINTAINER Martijn Koster "mak-docker@greenhills.co.uk"
+
+LABEL maintainer="Martijn Koster \"mak-docker@greenhills.co.uk\""
+LABEL repository="https://github.com/docker-solr/docker-solr"
# Override the solr download location with e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=http://www-eu.apache.org/dist/lucene/solr .
ARG SOLR_DOWNLOAD_SERVER
RUN apt-get update && \
- apt-get -y install lsof procps wget gpg && \
+ apt-get -y install lsof procps wget gpg dirmngr && \
rm -rf /var/lib/apt/lists/*
ENV SOLR_USER="solr" \
SOLR_UID="8983" \
SOLR_GROUP="solr" \
SOLR_GID="8983" \
- SOLR_VERSION="7.6.0" \
- SOLR_URL="${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/7.6.0/solr-7.6.0.tgz" \
- SOLR_SHA256="2cb425a0b30ff153465d306803e514e53e41924d74f28d842cb3a07cace759d5" \
- SOLR_KEYS="95B01F0E78111D63D331C1A751F0CC22F625308A" \
+ SOLR_VERSION="7.7.0" \
+ SOLR_URL="${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/7.7.0/solr-7.7.0.tgz" \
+ SOLR_SHA256="ad9eaa29449701fcabad497cc5f0506f8a8f76da714dc4a5429a549fcac24dc7" \
+ SOLR_KEYS="052C5B48A480B9CEA9E218A5F98C13CFA5A135D8" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH"
-ENV GOSU_VERSION 1.10
+ENV GOSU_VERSION 1.11
ENV GOSU_KEY B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN groupadd -r --gid $SOLR_GID $SOLR_GROUP && \
@@ -30,6 +32,7 @@ RUN set -e; \
export GNUPGHOME="/tmp/gnupg_home" && \
mkdir -p "$GNUPGHOME" && \
chmod 700 "$GNUPGHOME" && \
+ echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf" && \
for key in $SOLR_KEYS $GOSU_KEY; do \
found=''; \
for server in \
@@ -40,6 +43,7 @@ RUN set -e; \
; do \
echo " trying $server for $key"; \
gpg --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$key" && found=yes && break; \
+ gpg --batch --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; \
@@ -69,10 +73,9 @@ RUN set -e; \
sed -i -e 's/"\$(whoami)" == "root"/$(id -u) == 0/' /opt/solr/bin/solr && \
sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr && \
sed -i -e '/-Dsolr.clustering.enabled=true/ a SOLR_OPTS="$SOLR_OPTS -Dsun.net.inetaddr.ttl=60 -Dsun.net.inetaddr.negative.ttl=60"' /opt/solr/bin/solr.in.sh && \
- chown -R $SOLR_USER:$SOLR_GROUP /opt/solr
+ chown -R $SOLR_USER:$SOLR_GROUP /opt/solr /opt/mysolrhome /docker-entrypoint-initdb.d /opt/docker-solr
-COPY scripts /opt/docker-solr/scripts
-RUN chown -R $SOLR_USER:$SOLR_GROUP /opt/docker-solr /opt/mysolrhome
+COPY --chown=solr:solr scripts /opt/docker-solr/scripts
EXPOSE 8983
WORKDIR /opt/solr |
|
LGTM Build test of #5431; 98df512; $ bashbrew build solr:7.7.0
Building bashbrew/cache:c4d05f6f59567f28cc9807f4abbedde43958d553fb6f1a0c36e85dbf111e36a9 (solr:7.7.0)
Tagging solr:7.7.0
Tagging solr:7.7
Tagging solr:7
Tagging solr:latest
$ test/run.sh solr:7.7.0
testing solr:7.7.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:7.7.0-alpine
Building bashbrew/cache:71b2fa93b45af8af4bcbb88e1cb9f930c9f49752bba1c9e05433b1b06ca3f14a (solr:7.7.0-alpine)
Tagging solr:7.7.0-alpine
Tagging solr:7.7-alpine
Tagging solr:7-alpine
Tagging solr:alpine
$ test/run.sh solr:7.7.0-alpine
testing solr:7.7.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:7.7.0-slim
Building bashbrew/cache:a96dc8adc66805b94cad56aabdefa44860c286bf73a8633f6ff2abd9ea238e3f (solr:7.7.0-slim)
Tagging solr:7.7.0-slim
Tagging solr:7.7-slim
Tagging solr:7-slim
Tagging solr:slim
$ test/run.sh solr:7.7.0-slim
testing solr:7.7.0-slim
'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:7.6.0
Building bashbrew/cache:811505e302b85987b6e733496ce28b05d39107726f5db1742c3425d5814d22fe (solr:7.6.0)
Tagging solr:7.6.0
Tagging solr:7.6
$ test/run.sh solr:7.6.0
testing solr:7.6.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:7.6.0-alpine
Building bashbrew/cache:18dbb121252b518f483c9b849165a6ade2b72848b486efb6376ee7fbe06d4a8e (solr:7.6.0-alpine)
Tagging solr:7.6.0-alpine
Tagging solr:7.6-alpine
$ test/run.sh solr:7.6.0-alpine
testing solr:7.6.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:7.6.0-slim
Building bashbrew/cache:274ab4a55ff2c6c02d99eeaff90d2ba3da43a58acd2f1cb6ee554689e6306864 (solr:7.6.0-slim)
Tagging solr:7.6.0-slim
Tagging solr:7.6-slim
$ test/run.sh solr:7.6.0-slim
testing solr:7.6.0-slim
'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:7.5.0
Building bashbrew/cache:92384397250e820cbcb37269a7f32e0d37b69cdf5ffb9c64a777aa4b9e44fea4 (solr:7.5.0)
Tagging solr:7.5.0
Tagging solr:7.5
$ test/run.sh solr:7.5.0
testing solr:7.5.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:7.5.0-alpine
Building bashbrew/cache:1137f4c72f91b7782f32ba5844322384b1e54eda876c49d4f2f1aaeffea492b7 (solr:7.5.0-alpine)
Tagging solr:7.5.0-alpine
Tagging solr:7.5-alpine
$ test/run.sh solr:7.5.0-alpine
testing solr:7.5.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:7.5.0-slim
Building bashbrew/cache:db820c896e25cbc411afbb78ef610dddf2172076e2b364633472c9dfe004b5b2 (solr:7.5.0-slim)
Tagging solr:7.5.0-slim
Tagging solr:7.5-slim
$ test/run.sh solr:7.5.0-slim
testing solr:7.5.0-slim
'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:7.4.0
Building bashbrew/cache:e5bc14585006a903a95935a4adeaa2e7db55137b1c6308469b1d9908f5a9d388 (solr:7.4.0)
Tagging solr:7.4.0
Tagging solr:7.4
$ test/run.sh solr:7.4.0
testing solr:7.4.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:7.4.0-alpine
Building bashbrew/cache:c39879eb1d22230896bec7a8717c05286bdbf85fe2d8fe1751edfe5d2af0ef41 (solr:7.4.0-alpine)
Tagging solr:7.4.0-alpine
Tagging solr:7.4-alpine
$ test/run.sh solr:7.4.0-alpine
testing solr:7.4.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:7.4.0-slim
Building bashbrew/cache:e31238680ef38d4f53e8f5329d26fcdb2568d3c8cde980d01835da2326571ed1 (solr:7.4.0-slim)
Tagging solr:7.4.0-slim
Tagging solr:7.4-slim
$ test/run.sh solr:7.4.0-slim
testing solr:7.4.0-slim
'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:7.3.1
Building bashbrew/cache:8690e0f21d4e36ecd48240864e0b9379b601d421392f9caca445ae9b53454d0c (solr:7.3.1)
Tagging solr:7.3.1
Tagging solr:7.3
$ test/run.sh solr:7.3.1
testing solr:7.3.1
'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:7.3.1-alpine
Building bashbrew/cache:18308a0bcd5c5f49137c7e3ed1fb0e57028ab4ee248b63e033930b255948671e (solr:7.3.1-alpine)
Tagging solr:7.3.1-alpine
Tagging solr:7.3-alpine
$ test/run.sh solr:7.3.1-alpine
testing solr:7.3.1-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:7.3.1-slim
Building bashbrew/cache:fd5f6d5bc75ebdfc6684203293f971854659e598e4985c9c12e513434d488b6f (solr:7.3.1-slim)
Tagging solr:7.3.1-slim
Tagging solr:7.3-slim
$ test/run.sh solr:7.3.1-slim
testing solr:7.3.1-slim
'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:7.2.1
Building bashbrew/cache:aef0986facee258aa696e8c0c6596605f95d1c2d144c9872b01e70909c887711 (solr:7.2.1)
Tagging solr:7.2.1
Tagging solr:7.2
$ test/run.sh solr:7.2.1
testing solr:7.2.1
'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:7.2.1-alpine
Building bashbrew/cache:d8b7285896c176e1641fd15841e649fea35c023d36504a7d01cbc252189170ff (solr:7.2.1-alpine)
Tagging solr:7.2.1-alpine
Tagging solr:7.2-alpine
$ test/run.sh solr:7.2.1-alpine
testing solr:7.2.1-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:7.2.1-slim
Building bashbrew/cache:5b6a7c362de242f8c3ffffe832f72fc72641db1e16abb1a785fae6b1ba3c51b2 (solr:7.2.1-slim)
Tagging solr:7.2.1-slim
Tagging solr:7.2-slim
$ test/run.sh solr:7.2.1-slim
testing solr:7.2.1-slim
'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:7.1.0
Building bashbrew/cache:8301f496496a1cf8163504e3437c2945a7aac1ef630000ec4f8f3be9c3162dcc (solr:7.1.0)
Tagging solr:7.1.0
Tagging solr:7.1
$ test/run.sh solr:7.1.0
testing solr:7.1.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:7.1.0-alpine
Building bashbrew/cache:159dcbedf45a53e9ae928ec6e0a846ebf9c9d8053331af58c467c41075b204cd (solr:7.1.0-alpine)
Tagging solr:7.1.0-alpine
Tagging solr:7.1-alpine
$ test/run.sh solr:7.1.0-alpine
testing solr:7.1.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:7.1.0-slim
Building bashbrew/cache:39e709f27fc6fcdbde29bcac2820b57c824f4958ffeff29c15c62bb71a6dd3d5 (solr:7.1.0-slim)
Tagging solr:7.1.0-slim
Tagging solr:7.1-slim
$ test/run.sh solr:7.1.0-slim
testing solr:7.1.0-slim
'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.6.5
Building bashbrew/cache:852f4192b8d6ec65c1887b50b754857eaf8ac433e9f76a36a2eed0833b38eb8b (solr:6.6.5)
Tagging solr:6.6.5
Tagging solr:6.6
Tagging solr:6
$ test/run.sh solr:6.6.5
testing solr:6.6.5
'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.6.5-alpine
Building bashbrew/cache:3f7e85c34bae9854feb61d6ffb9850b44548fd0bed388b5434905d198e173dd5 (solr:6.6.5-alpine)
Tagging solr:6.6.5-alpine
Tagging solr:6.6-alpine
Tagging solr:6-alpine
$ test/run.sh solr:6.6.5-alpine
testing solr:6.6.5-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.6.5-slim
Building bashbrew/cache:46dd5b74ee7ee5cffc481055a05de7d9aee9898e1bf017a4b5c9bb9787610201 (solr:6.6.5-slim)
Tagging solr:6.6.5-slim
Tagging solr:6.6-slim
Tagging solr:6-slim
$ test/run.sh solr:6.6.5-slim
testing solr:6.6.5-slim
'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.5
Building bashbrew/cache:98f05ff5a0800ee81cdddaf4bfba27ff57a8fe895ca1f7cc62b86f92bd40ad10 (solr:5.5.5)
Tagging solr:5.5.5
Tagging solr:5.5
Tagging solr:5
$ test/run.sh solr:5.5.5
testing solr:5.5.5
'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.5-alpine
Building bashbrew/cache:64af6249c6e20d7049d34350e7a3033518d31bfc1afb92bbccce2f820dd3a864 (solr:5.5.5-alpine)
Tagging solr:5.5.5-alpine
Tagging solr:5.5-alpine
Tagging solr:5-alpine
$ test/run.sh solr:5.5.5-alpine
testing solr:5.5.5-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:5.5.5-slim
Building bashbrew/cache:74b24ca27cb457004506f57eb9cf698f7ad0dcda438972cb1c0e2a11549ccfe6 (solr:5.5.5-slim)
Tagging solr:5.5.5-slim
Tagging solr:5.5-slim
Tagging solr:5-slim
$ test/run.sh solr:5.5.5-slim
testing solr:5.5.5-slim
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Announcement: http://mail-archives.us.apache.org/mod_mbox/www-announce/201902.mbox/%3CCAKUpjcRbiJwaNVzKgHcsAb+aBnQn8ChaOYsYOsrffL75VW=O0Q@mail.gmail.com%3E
Changes: http://lucene.apache.org/solr/7_7_0/changes/Changes.html#v7.7.0.other_changes