You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2024/02/13 16:30:21 UTC
(solr-docker) branch main updated: Remove stale versions 9.0, 9.1, 9.2, 9.3 (#18)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-docker.git
The following commit(s) were added to refs/heads/main by this push:
new 47b8400 Remove stale versions 9.0, 9.1, 9.2, 9.3 (#18)
47b8400 is described below
commit 47b84007a29fa9a9d47917e1ba7f82cf863a5c93
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Tue Feb 13 17:30:16 2024 +0100
Remove stale versions 9.0, 9.1, 9.2, 9.3 (#18)
---
9.0/Dockerfile | 141 ----------------------------------------------------
9.1/Dockerfile | 140 ---------------------------------------------------
9.2/Dockerfile | 141 ----------------------------------------------------
9.3-slim/Dockerfile | 133 -------------------------------------------------
9.3/Dockerfile | 133 -------------------------------------------------
5 files changed, 688 deletions(-)
diff --git a/9.0/Dockerfile b/9.0/Dockerfile
deleted file mode 100644
index a03fc00..0000000
--- a/9.0/Dockerfile
+++ /dev/null
@@ -1,141 +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.
-
-# Patched 2022-10-21 to use eclipse-temurin:11-jre-focal which used Ubuntu 20.04, compatible with Docker client < 20.10.16
-FROM eclipse-temurin:17-jre-focal
-
-# TODO: remove things that exist solely for downstream specialization since Dockerfile.local now exists for that
-
-ARG SOLR_VERSION="9.0.0"
-ARG SOLR_SHA512="383c6b6f352f2a385ece99b2b0a82e1552430aea65c6c33e5569da422138844192db4e06f58699325af55ee631694e16f836a5bbf8556f86fdeabc0cfa0533d5"
-ARG SOLR_KEYS="3558857D1F5754B78C7F8B5A71A45A3D0D8D0B93"
-
-# If specified, this will override SOLR_DOWNLOAD_SERVER and all ASF mirrors. Typically used downstream for custom builds
-ARG SOLR_DOWNLOAD_URL
-# TODO: That comment isn't strictly true, if SOLR_DOWNLOAD_URL fails, other mirrors will be attempted
-# TODO: see patch in SOLR-15250 for some example ideas on fixing this to be more strict
-
-# Override the default solr download location with a prefered mirror, e.g.:
-# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=https://downloads.apache.org/solr/solr .
-ARG SOLR_DOWNLOAD_SERVER
-
-# These should never be overridden except for the purposes of testing the Dockerfile before release
-ARG SOLR_CLOSER_URL="http://www.apache.org/dyn/closer.lua?action=download&filename=/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
-ARG SOLR_DIST_URL="https://downloads.apache.org/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
-ARG SOLR_ARCHIVE_URL="https://archive.apache.org/dist/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
-
-RUN set -ex; \
- apt-get update; \
- apt-get -y install wget gpg dirmngr; \
- rm -rf /var/lib/apt/lists/*; \
- 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'; \
- # Only keep the release key
- release_keys="$(gpg --batch --export -a ${SOLR_KEYS})"; \
- rm -rf "$GNUPGHOME"/*; \
- echo "${release_keys}" | gpg --batch --import; \
- fi; \
- MAX_REDIRECTS=2; \
- if [ -n "$SOLR_DOWNLOAD_URL" ]; then \
- # If a custom URL is defined, we download from non-ASF mirror URL and allow more redirects and skip GPG step
- # This takes effect only if the SOLR_DOWNLOAD_URL build-arg is specified, typically in downstream Dockerfiles
- MAX_REDIRECTS=4; \
- SKIP_GPG_CHECK=true; \
- elif [ -n "$SOLR_DOWNLOAD_SERVER" ]; then \
- SOLR_DOWNLOAD_URL="$SOLR_DOWNLOAD_SERVER/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"; \
- fi; \
- for url in $SOLR_DOWNLOAD_URL $SOLR_CLOSER_URL $SOLR_DIST_URL $SOLR_ARCHIVE_URL; do \
- if [ -f "/opt/solr-$SOLR_VERSION.tgz" ]; then break; fi; \
- echo "downloading $url"; \
- if wget -t 10 --max-redirect $MAX_REDIRECTS --retry-connrefused -nv "$url" -O "/opt/solr-$SOLR_VERSION.tgz"; then break; else rm -f "/opt/solr-$SOLR_VERSION.tgz"; fi; \
- done; \
- if [ ! -f "/opt/solr-$SOLR_VERSION.tgz" ]; then echo "failed all download attempts for solr-$SOLR_VERSION.tgz"; exit 1; fi; \
- if [ -z "$SKIP_GPG_CHECK" ]; then \
- echo "downloading $SOLR_ARCHIVE_URL.asc"; \
- wget -nv "$SOLR_ARCHIVE_URL.asc" -O "/opt/solr-$SOLR_VERSION.tgz.asc"; \
- echo "$SOLR_SHA512 */opt/solr-$SOLR_VERSION.tgz" | sha512sum -c -; \
- (>&2 ls -l "/opt/solr-$SOLR_VERSION.tgz" "/opt/solr-$SOLR_VERSION.tgz.asc"); \
- gpg --batch --verify "/opt/solr-$SOLR_VERSION.tgz.asc" "/opt/solr-$SOLR_VERSION.tgz"; \
- else \
- echo "Skipping GPG validation due to non-Apache build"; \
- fi; \
- { command -v gpgconf; gpgconf --kill all || :; }; \
- rm -r "$GNUPGHOME"; \
- tar -C /opt --extract --preserve-permissions --file "/opt/solr-$SOLR_VERSION.tgz"; \
- rm "/opt/solr-$SOLR_VERSION.tgz"*;
-
-
-
-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"
-
-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; \
- ln -s /opt/solr/modules /opt/solr/contrib; \
- ln -s /opt/solr/prometheus-exporter /opt/solr/modules/prometheus-exporter;
-
-RUN set -ex; \
- apt-get update; \
- apt-get -y install acl dirmngr lsof procps wget netcat gosu tini jattach; \
- rm -rf /var/lib/apt/lists/*;
-
-VOLUME /var/solr
-EXPOSE 8983
-WORKDIR /opt/solr
-USER $SOLR_USER
-
-ENTRYPOINT ["docker-entrypoint.sh"]
-# TODO: Workaround for JDK17+ JIT compiler bug https://bugs.openjdk.org/browse/JDK-8285835)
-CMD ["solr-foreground", "-a", "-XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put"]
diff --git a/9.1/Dockerfile b/9.1/Dockerfile
deleted file mode 100644
index 6a58bf0..0000000
--- a/9.1/Dockerfile
+++ /dev/null
@@ -1,140 +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-focal
-
-# TODO: remove things that exist solely for downstream specialization since Dockerfile.local now exists for that
-
-ARG SOLR_VERSION="9.1.1"
-ARG SOLR_SHA512="59fd47185196fc6b0fad4b6b2ba547d136cc0c688addc9833129086944cc90e185a18c33fd70523edddad1a6ebe7b4cd893be5065c2b01fe21a5026bdb7e5d9f"
-ARG SOLR_KEYS="C3E7CBD9B9FE2B419EB14B89612B39A5BC981763"
-
-# If specified, this will override SOLR_DOWNLOAD_SERVER and all ASF mirrors. Typically used downstream for custom builds
-ARG SOLR_DOWNLOAD_URL
-# TODO: That comment isn't strictly true, if SOLR_DOWNLOAD_URL fails, other mirrors will be attempted
-# TODO: see patch in SOLR-15250 for some example ideas on fixing this to be more strict
-
-# Override the default solr download location with a prefered mirror, e.g.:
-# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=https://downloads.apache.org/solr/solr .
-ARG SOLR_DOWNLOAD_SERVER
-
-# These should never be overridden except for the purposes of testing the Dockerfile before release
-ARG SOLR_CLOSER_URL="http://www.apache.org/dyn/closer.lua?action=download&filename=/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
-ARG SOLR_DIST_URL="https://downloads.apache.org/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
-ARG SOLR_ARCHIVE_URL="https://archive.apache.org/dist/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
-
-RUN set -ex; \
- apt-get update; \
- apt-get -y install wget gpg dirmngr; \
- rm -rf /var/lib/apt/lists/*; \
- 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; \
- MAX_REDIRECTS=3; \
- if [ -n "$SOLR_DOWNLOAD_URL" ]; then \
- # If a custom URL is defined, we download from non-ASF mirror URL and allow more redirects and skip GPG step
- # This takes effect only if the SOLR_DOWNLOAD_URL build-arg is specified, typically in downstream Dockerfiles
- MAX_REDIRECTS=4; \
- SKIP_GPG_CHECK=true; \
- elif [ -n "$SOLR_DOWNLOAD_SERVER" ]; then \
- SOLR_DOWNLOAD_URL="$SOLR_DOWNLOAD_SERVER/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"; \
- fi; \
- for url in $SOLR_DOWNLOAD_URL $SOLR_CLOSER_URL $SOLR_DIST_URL $SOLR_ARCHIVE_URL; do \
- if [ -f "/opt/solr-$SOLR_VERSION.tgz" ]; then break; fi; \
- echo "downloading $url"; \
- if wget -t 10 --max-redirect $MAX_REDIRECTS --retry-connrefused -nv "$url" -O "/opt/solr-$SOLR_VERSION.tgz"; then break; else rm -f "/opt/solr-$SOLR_VERSION.tgz"; fi; \
- done; \
- if [ ! -f "/opt/solr-$SOLR_VERSION.tgz" ]; then echo "failed all download attempts for solr-$SOLR_VERSION.tgz"; exit 1; fi; \
- if [ -z "$SKIP_GPG_CHECK" ]; then \
- echo "downloading $SOLR_ARCHIVE_URL.asc"; \
- wget -nv "$SOLR_ARCHIVE_URL.asc" -O "/opt/solr-$SOLR_VERSION.tgz.asc"; \
- echo "$SOLR_SHA512 */opt/solr-$SOLR_VERSION.tgz" | sha512sum -c -; \
- (>&2 ls -l "/opt/solr-$SOLR_VERSION.tgz" "/opt/solr-$SOLR_VERSION.tgz.asc"); \
- gpg --batch --verify "/opt/solr-$SOLR_VERSION.tgz.asc" "/opt/solr-$SOLR_VERSION.tgz"; \
- else \
- echo "Skipping GPG validation due to non-Apache build"; \
- fi; \
- { command -v gpgconf; gpgconf --kill all || :; }; \
- rm -r "$GNUPGHOME"; \
- tar -C /opt --extract --preserve-permissions --file "/opt/solr-$SOLR_VERSION.tgz"; \
- rm "/opt/solr-$SOLR_VERSION.tgz"*;
-
-
-
-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"
-
-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; \
- ln -s /opt/solr/modules /opt/solr/contrib; \
- ln -s /opt/solr/prometheus-exporter /opt/solr/modules/prometheus-exporter;
-
-RUN set -ex; \
- apt-get update; \
- apt-get -y install acl dirmngr 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.2/Dockerfile b/9.2/Dockerfile
deleted file mode 100644
index 597dd17..0000000
--- a/9.2/Dockerfile
+++ /dev/null
@@ -1,141 +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
-
-# TODO: remove things that exist solely for downstream specialization since Dockerfile.local now exists for that
-
-ARG SOLR_VERSION="9.2.1"
-ARG SOLR_SHA512="1ff1bd22255b0ae5a1ade1d03596c1f35d4fa69fa1a16e823eaa554b30ba1311f031af6e1f95a94dbdd3a1dbf308eeb068e7303b74f83584a8bb443505078cbb"
-ARG SOLR_KEYS="FDB3D11D716BB32ACF8C93AB919B21537AA80271"
-
-# If specified, this will override SOLR_DOWNLOAD_SERVER and all ASF mirrors. Typically used downstream for custom builds
-ARG SOLR_DOWNLOAD_URL
-# TODO: That comment isn't strictly true, if SOLR_DOWNLOAD_URL fails, other mirrors will be attempted
-# TODO: see patch in SOLR-15250 for some example ideas on fixing this to be more strict
-
-# Override the default solr download location with a prefered mirror, e.g.:
-# docker build -t mine --build-arg SOLR_DOWNLOAD_SERVER=https://downloads.apache.org/solr/solr .
-ARG SOLR_DOWNLOAD_SERVER
-
-# These should never be overridden except for the purposes of testing the Dockerfile before release
-ARG SOLR_CLOSER_URL="http://www.apache.org/dyn/closer.lua?action=download&filename=/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
-ARG SOLR_DIST_URL="https://downloads.apache.org/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
-ARG SOLR_ARCHIVE_URL="https://archive.apache.org/dist/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
-
-RUN set -ex; \
- apt-get update; \
- apt-get -y install wget gpg dirmngr; \
- rm -rf /var/lib/apt/lists/*; \
- 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; \
- MAX_REDIRECTS=3; \
- if [ -n "$SOLR_DOWNLOAD_URL" ]; then \
- # If a custom URL is defined, we download from non-ASF mirror URL and allow more redirects and skip GPG step
- # This takes effect only if the SOLR_DOWNLOAD_URL build-arg is specified, typically in downstream Dockerfiles
- MAX_REDIRECTS=4; \
- SKIP_GPG_CHECK=true; \
- elif [ -n "$SOLR_DOWNLOAD_SERVER" ]; then \
- SOLR_DOWNLOAD_URL="$SOLR_DOWNLOAD_SERVER/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"; \
- fi; \
- for url in $SOLR_DOWNLOAD_URL $SOLR_CLOSER_URL $SOLR_DIST_URL $SOLR_ARCHIVE_URL; do \
- if [ -f "/opt/solr-$SOLR_VERSION.tgz" ]; then break; fi; \
- echo "downloading $url"; \
- if wget -t 10 --max-redirect $MAX_REDIRECTS --retry-connrefused -nv "$url" -O "/opt/solr-$SOLR_VERSION.tgz"; then break; else rm -f "/opt/solr-$SOLR_VERSION.tgz"; fi; \
- done; \
- if [ ! -f "/opt/solr-$SOLR_VERSION.tgz" ]; then echo "failed all download attempts for solr-$SOLR_VERSION.tgz"; exit 1; fi; \
- if [ -z "$SKIP_GPG_CHECK" ]; then \
- echo "downloading $SOLR_ARCHIVE_URL.asc"; \
- wget -nv "$SOLR_ARCHIVE_URL.asc" -O "/opt/solr-$SOLR_VERSION.tgz.asc"; \
- echo "$SOLR_SHA512 */opt/solr-$SOLR_VERSION.tgz" | sha512sum -c -; \
- (>&2 ls -l "/opt/solr-$SOLR_VERSION.tgz" "/opt/solr-$SOLR_VERSION.tgz.asc"); \
- gpg --batch --verify "/opt/solr-$SOLR_VERSION.tgz.asc" "/opt/solr-$SOLR_VERSION.tgz"; \
- else \
- echo "Skipping GPG validation due to non-Apache build"; \
- fi; \
- { command -v gpgconf; gpgconf --kill all || :; }; \
- rm -r "$GNUPGHOME"; \
- tar -C /opt --extract --preserve-permissions --file "/opt/solr-$SOLR_VERSION.tgz"; \
- rm "/opt/solr-$SOLR_VERSION.tgz"*; \
- 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"
-
-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; \
- ln -s /opt/solr/modules /opt/solr/contrib; \
- ln -s /opt/solr/prometheus-exporter /opt/solr/modules/prometheus-exporter;
-
-RUN set -ex; \
- apt-get update; \
- apt-get -y 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.3-slim/Dockerfile b/9.3-slim/Dockerfile
deleted file mode 100644
index bc431b0..0000000
--- a/9.3-slim/Dockerfile
+++ /dev/null
@@ -1,133 +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.3.0"
-# empty for the full distribution, "-slim" for the slim distribution
-ARG SOLR_DIST="-slim"
-ARG SOLR_SHA512="432306fa6db9d772df84d6acb3adab095783dda10e55280bfd443e197969271364d86f5c64d737ca6c6660bda81e13ffe404e34feb8447dff6ca0cd302ddd076"
-ARG SOLR_KEYS="50E3EE1C91C7E0CB4DFB007B369424FC98F3F6EC"
-
-# 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"
-
-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.3/Dockerfile b/9.3/Dockerfile
deleted file mode 100644
index eff7e02..0000000
--- a/9.3/Dockerfile
+++ /dev/null
@@ -1,133 +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.3.0"
-# empty for the full distribution, "-slim" for the slim distribution
-ARG SOLR_DIST=""
-ARG SOLR_SHA512="fcd1ca482744f4a72c21c59d1877f3aeeb4b8683cf89af70bb10d29fc07da1858628b2666e3c363227e4b2f7a8ef33c2b63065811ae1c2f2843fe9f09305cb59"
-ARG SOLR_KEYS="50E3EE1C91C7E0CB4DFB007B369424FC98F3F6EC"
-
-# 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"
-
-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"]