Apache Solr release 9.7.0
diff --git a/9.5/Dockerfile b/9.5/Dockerfile
deleted file mode 100644
index 5a64a36..0000000
--- a/9.5/Dockerfile
+++ /dev/null
@@ -1,134 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-FROM eclipse-temurin:17-jre-jammy
-
-ARG SOLR_VERSION="9.5.0"
-# empty for the full distribution, "-slim" for the slim distribution
-ARG SOLR_DIST=""
-ARG SOLR_SHA512="e34b2421db8586691ff41b86beca77bcb61243ce8edfade74eda8da4b0fabde0078884db301350a0d0dfc4a6fee46320ddf059469300444da4e3693220df5e40"
-ARG SOLR_KEYS="E05FDF113D89E7FB4A2DF4B2684D544160392455"
-
-# Override the default solr download location with a preferred mirror, e.g.:
-# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=https://downloads.apache.org/solr/solr .
-# This server must support downloading at: ${SOLR_DOWNLOAD_SERVER}/${SOLR_VERSION}/solr-${SOLR_VERSION}(-slim).tgz(.asc)
-ARG SOLR_DOWNLOAD_SERVER="https://www.apache.org/dyn/closer.lua?action=download&filename=/solr/solr"
-
-RUN set -ex; \
- apt-get update; \
- apt-get -y --no-install-recommends install wget gpg gnupg dirmngr; \
- rm -rf /var/lib/apt/lists/*; \
- export SOLR_BINARY="solr-$SOLR_VERSION$SOLR_DIST.tgz"; \
- MAX_REDIRECTS=3; \
- case "${SOLR_DOWNLOAD_SERVER}" in \
- (*"apache.org"*);; \
- (*) \
- # If a non-ASF URL is provided, allow more redirects and skip GPG step.
- MAX_REDIRECTS=4 && \
- SKIP_GPG_CHECK=true;; \
- esac; \
- export DOWNLOAD_URL="$SOLR_DOWNLOAD_SERVER/$SOLR_VERSION/$SOLR_BINARY"; \
- echo "downloading $DOWNLOAD_URL"; \
- if ! wget -t 10 --max-redirect $MAX_REDIRECTS --retry-connrefused -nv "$DOWNLOAD_URL" -O "/opt/$SOLR_BINARY"; then rm -f "/opt/$SOLR_BINARY"; fi; \
- if [ ! -f "/opt/$SOLR_BINARY" ]; then echo "failed download attempt for $SOLR_BINARY"; exit 1; fi; \
- echo "$SOLR_SHA512 */opt/$SOLR_BINARY" | sha512sum -c -; \
- if [ -z "$SKIP_GPG_CHECK" ]; then \
- # Setup GPG \
- export GNUPGHOME="/tmp/gnupg_home"; \
- mkdir -p "$GNUPGHOME"; \
- chmod 700 "$GNUPGHOME"; \
- echo "disable-ipv6" >> "$GNUPGHOME/dirmngr.conf"; \
- if [ -n "$SOLR_KEYS" ]; then \
- # Install all Solr GPG Keys to start
- wget -nv "https://downloads.apache.org/solr/KEYS" -O- | \
- gpg --batch --import --key-origin 'url,https://downloads.apache.org/solr/KEYS'; \
- # Save just the release key
- release_keys="$(gpg --batch --export -a ${SOLR_KEYS})"; \
- rm -rf "$GNUPGHOME"/*; \
- echo "${release_keys}" | gpg --batch --import; \
- fi; \
- # Do GPG Checks
- echo "downloading $DOWNLOAD_URL.asc"; \
- wget -nv "$DOWNLOAD_URL.asc" -O "/opt/$SOLR_BINARY.asc"; \
- (>&2 ls -l "/opt/$SOLR_BINARY" "/opt/$SOLR_BINARY.asc"); \
- gpg --batch --verify "/opt/$SOLR_BINARY.asc" "/opt/$SOLR_BINARY"; \
- # Cleanup GPG
- { command -v gpgconf; gpgconf --kill all || :; }; \
- rm -r "$GNUPGHOME"; \
- else \
- echo "Skipping GPG validation due to non-Apache build"; \
- fi; \
- tar -C /opt --extract --preserve-permissions --file "/opt/$SOLR_BINARY"; \
- rm "/opt/$SOLR_BINARY"*; \
- apt-get -y remove gpg dirmngr && apt-get -y autoremove;
-
-
-
-LABEL org.opencontainers.image.title="Apache Solr"
-LABEL org.opencontainers.image.description="Apache Solr is the popular, blazing-fast, open source search platform built on Apache Lucene."
-LABEL org.opencontainers.image.authors="The Apache Solr Project"
-LABEL org.opencontainers.image.url="https://solr.apache.org"
-LABEL org.opencontainers.image.source="https://github.com/apache/solr"
-LABEL org.opencontainers.image.documentation="https://solr.apache.org/guide/"
-LABEL org.opencontainers.image.version="${SOLR_VERSION}"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-
-ENV SOLR_USER="solr" \
- SOLR_UID="8983" \
- SOLR_GROUP="solr" \
- SOLR_GID="8983" \
- PATH="/opt/solr/bin:/opt/solr/docker/scripts:/opt/solr/prometheus-exporter/bin:$PATH" \
- SOLR_INCLUDE=/etc/default/solr.in.sh \
- SOLR_HOME=/var/solr/data \
- SOLR_PID_DIR=/var/solr \
- SOLR_LOGS_DIR=/var/solr/logs \
- LOG4J_PROPS=/var/solr/log4j2.xml \
- SOLR_JETTY_HOST="0.0.0.0" \
- SOLR_ZK_EMBEDDED_HOST="0.0.0.0"
-
-RUN set -ex; \
- groupadd -r --gid "$SOLR_GID" "$SOLR_GROUP"; \
- useradd -r --uid "$SOLR_UID" --gid "$SOLR_GID" "$SOLR_USER"
-
-# add symlink to /opt/solr, remove what we don't want.
-# Remove the Dockerfile because it might not represent the dockerfile that was used to generate the image.
-RUN set -ex; \
- (cd /opt; ln -s solr-*/ solr); \
- rm -Rf /opt/solr/docs /opt/solr/docker/Dockerfile;
-
-RUN set -ex; \
- mkdir -p /opt/solr/server/solr/lib /docker-entrypoint-initdb.d; \
- cp /opt/solr/bin/solr.in.sh /etc/default/solr.in.sh; \
- mv /opt/solr/bin/solr.in.sh /opt/solr/bin/solr.in.sh.orig; \
- mv /opt/solr/bin/solr.in.cmd /opt/solr/bin/solr.in.cmd.orig; \
- chmod 0664 /etc/default/solr.in.sh; \
- mkdir -p -m0770 /var/solr; \
- chown -R "$SOLR_USER:0" /var/solr; \
- test ! -e /opt/solr/modules || ln -s /opt/solr/modules /opt/solr/contrib; \
- test ! -e /opt/solr/prometheus-exporter || ln -s /opt/solr/prometheus-exporter /opt/solr/modules/prometheus-exporter;
-
-RUN set -ex; \
- apt-get update; \
- apt-get -y --no-install-recommends install acl lsof procps wget netcat gosu tini jattach; \
- rm -rf /var/lib/apt/lists/*;
-
-VOLUME /var/solr
-EXPOSE 8983
-WORKDIR /opt/solr
-USER $SOLR_UID
-
-ENTRYPOINT ["docker-entrypoint.sh"]
-CMD ["solr-foreground"]
diff --git a/9.5-slim/Dockerfile b/9.7-slim/Dockerfile
similarity index 95%
rename from 9.5-slim/Dockerfile
rename to 9.7-slim/Dockerfile
index 02d58d3..33f1c88 100644
--- a/9.5-slim/Dockerfile
+++ b/9.7-slim/Dockerfile
@@ -16,11 +16,11 @@
FROM eclipse-temurin:17-jre-jammy
-ARG SOLR_VERSION="9.5.0"
+ARG SOLR_VERSION="9.7.0"
# empty for the full distribution, "-slim" for the slim distribution
ARG SOLR_DIST="-slim"
-ARG SOLR_SHA512="9b94bbd4331aa5b871a388e39c38a381a8090041afabf8f0e338a776dbd1953bded419e8bbbee96771f4434f47884efa3eeb837f83b4ca55973b8c9f3bd045f6"
-ARG SOLR_KEYS="E05FDF113D89E7FB4A2DF4B2684D544160392455"
+ARG SOLR_SHA512="f270ebd94deb9a002fb4e57c5cc2c11c7acc583dfa8e65a814028aa22dd8d0fa7c8a18f92024d8c0f5b07853801d25dcb2e26b3b3d4c8b2d906485f8dc0224c9"
+ARG SOLR_KEYS="EDF961FF03E647F9CA8A9C2C758051CCA3A13A7F"
# Override the default solr download location with a preferred mirror, e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=https://downloads.apache.org/solr/solr .
diff --git a/9.5-slim/Dockerfile b/9.7/Dockerfile
similarity index 95%
copy from 9.5-slim/Dockerfile
copy to 9.7/Dockerfile
index 02d58d3..2f8d03e 100644
--- a/9.5-slim/Dockerfile
+++ b/9.7/Dockerfile
@@ -16,11 +16,11 @@
FROM eclipse-temurin:17-jre-jammy
-ARG SOLR_VERSION="9.5.0"
+ARG SOLR_VERSION="9.7.0"
# empty for the full distribution, "-slim" for the slim distribution
-ARG SOLR_DIST="-slim"
-ARG SOLR_SHA512="9b94bbd4331aa5b871a388e39c38a381a8090041afabf8f0e338a776dbd1953bded419e8bbbee96771f4434f47884efa3eeb837f83b4ca55973b8c9f3bd045f6"
-ARG SOLR_KEYS="E05FDF113D89E7FB4A2DF4B2684D544160392455"
+ARG SOLR_DIST=""
+ARG SOLR_SHA512="a80417a79c8371d2049868573927c587b4a5b7b37e938ca6e64e8a8842449f49eddc987968ddad5d6b6b1f4395990c1edc4576a884b3a62c4fbcd97091a659d9"
+ARG SOLR_KEYS="EDF961FF03E647F9CA8A9C2C758051CCA3A13A7F"
# Override the default solr download location with a preferred mirror, e.g.:
# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=https://downloads.apache.org/solr/solr .
