Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Apache Solr - Apache Solr release 9.8.0 #18275

Merged

Conversation

docker-solr-builder
Copy link

Apache Solr:

Apache Solr release 9.8.0

See apache/solr-docker@cd80b30 for the triggering commit.

Relevant Maintainers: @HoustonPutman @janhoy @dsmiley @madrob

This is an automated PR based on a change made in the https://github.com/apache/solr-docker repository's main branch.

@docker-solr-builder docker-solr-builder requested a review from a team as a code owner January 21, 2025 19:08
Copy link

Diff for 6ee52d8:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index a5f293b..8606581 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -12,22 +12,22 @@ Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: f11dfe66709370492d5b7b251d5eba5d70b8301d
 Directory: 8.11-slim
 
-Tags: 9.6.1, 9.6
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 9cd850b72309de05169544395c83a85b329d6b86
-Directory: 9.6
-
-Tags: 9.6.1-slim, 9.6-slim
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 9cd850b72309de05169544395c83a85b329d6b86
-Directory: 9.6-slim
-
-Tags: 9.7.0, 9.7, 9, latest
+Tags: 9.7.0, 9.7
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: cabde2a16c99aa974e1882df2c55ca17eab0bd17
 Directory: 9.7
 
-Tags: 9.7.0-slim, 9.7-slim, 9-slim, slim
+Tags: 9.7.0-slim, 9.7-slim
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: cabde2a16c99aa974e1882df2c55ca17eab0bd17
 Directory: 9.7-slim
+
+Tags: 9.8.0, 9.8, 9, latest
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: cd80b30b59886a4b71de8583e9990b8a31073e99
+Directory: 9.8
+
+Tags: 9.8.0-slim, 9.8-slim, 9-slim, slim
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: cd80b30b59886a4b71de8583e9990b8a31073e99
+Directory: 9.8-slim
diff --git a/_bashbrew-list b/_bashbrew-list
index aab89e4..2b069e4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,13 +6,13 @@ solr:8.11.4
 solr:8.11.4-slim
 solr:9
 solr:9-slim
-solr:9.6
-solr:9.6-slim
-solr:9.6.1
-solr:9.6.1-slim
 solr:9.7
 solr:9.7-slim
 solr:9.7.0
 solr:9.7.0-slim
+solr:9.8
+solr:9.8-slim
+solr:9.8.0
+solr:9.8.0-slim
 solr:latest
 solr:slim
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 7544e6d..c87a457 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,6 +1,6 @@
 solr:8
 solr:8-slim
-solr:9.6
-solr:9.6-slim
+solr:9.7
+solr:9.7-slim
 solr:latest
 solr:slim
diff --git a/solr_9.6-slim/Dockerfile b/solr_9.6-slim/Dockerfile
deleted file mode 100644
index 31de5e0..0000000
diff --git a/solr_9.6/Dockerfile b/solr_9.6/Dockerfile
deleted file mode 100644
index d8c604f..0000000
diff --git a/solr_slim/Dockerfile b/solr_9.7-slim/Dockerfile
similarity index 100%
copy from solr_slim/Dockerfile
copy to solr_9.7-slim/Dockerfile
diff --git a/solr_latest/Dockerfile b/solr_9.7/Dockerfile
similarity index 100%
copy from solr_latest/Dockerfile
copy to solr_9.7/Dockerfile
diff --git a/solr_latest/Dockerfile b/solr_latest/Dockerfile
index 2f8d03e..a857902 100644
--- a/solr_latest/Dockerfile
+++ b/solr_latest/Dockerfile
@@ -16,10 +16,10 @@
 
 FROM eclipse-temurin:17-jre-jammy
 
-ARG SOLR_VERSION="9.7.0"
+ARG SOLR_VERSION="9.8.0"
 # empty for the full distribution, "-slim" for the slim distribution
 ARG SOLR_DIST=""
-ARG SOLR_SHA512="a80417a79c8371d2049868573927c587b4a5b7b37e938ca6e64e8a8842449f49eddc987968ddad5d6b6b1f4395990c1edc4576a884b3a62c4fbcd97091a659d9"
+ARG SOLR_SHA512="e5db4fe32b5df45671c679d3ec5653bd5a969f43e28dad7e5f1b7633837c059250b610db7d593c13f674bf0edbaf4fe11ecb94c24fef6a22de952c6f2781800c"
 ARG SOLR_KEYS="EDF961FF03E647F9CA8A9C2C758051CCA3A13A7F"
 
 # Override the default solr download location with a preferred mirror, e.g.:
@@ -78,7 +78,7 @@ RUN set -ex; \
 
 
 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.description="Solr is the blazing-fast, open source, multi-modal search platform built on Apache Lucene. It powers full-text, vector, and geospatial search at many of the world's largest organizations."
 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"
@@ -90,7 +90,7 @@ 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" \
+    PATH="/opt/solr/bin:/opt/solr/docker/scripts:/opt/solr/prometheus-exporter/bin:/opt/solr/cross-dc-manager/bin:$PATH" \
     SOLR_INCLUDE=/etc/default/solr.in.sh \
     SOLR_HOME=/var/solr/data \
     SOLR_PID_DIR=/var/solr \
diff --git a/solr_slim/Dockerfile b/solr_slim/Dockerfile
index 33f1c88..245eb64 100644
--- a/solr_slim/Dockerfile
+++ b/solr_slim/Dockerfile
@@ -16,10 +16,10 @@
 
 FROM eclipse-temurin:17-jre-jammy
 
-ARG SOLR_VERSION="9.7.0"
+ARG SOLR_VERSION="9.8.0"
 # empty for the full distribution, "-slim" for the slim distribution
 ARG SOLR_DIST="-slim"
-ARG SOLR_SHA512="f270ebd94deb9a002fb4e57c5cc2c11c7acc583dfa8e65a814028aa22dd8d0fa7c8a18f92024d8c0f5b07853801d25dcb2e26b3b3d4c8b2d906485f8dc0224c9"
+ARG SOLR_SHA512="ba30ce2933fee3a7e13fb71d24c78860e45d11b36197eac95c7b8aa1faa1cfbf4d1bbf32e6d43c9a660f92e33c1e063db9b12fa5bbd3b023e01bb3f1d793f299"
 ARG SOLR_KEYS="EDF961FF03E647F9CA8A9C2C758051CCA3A13A7F"
 
 # Override the default solr download location with a preferred mirror, e.g.:
@@ -78,7 +78,7 @@ RUN set -ex; \
 
 
 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.description="Solr is the blazing-fast, open source, multi-modal search platform built on Apache Lucene. It powers full-text, vector, and geospatial search at many of the world's largest organizations."
 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"
@@ -90,7 +90,7 @@ 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" \
+    PATH="/opt/solr/bin:/opt/solr/docker/scripts:/opt/solr/prometheus-exporter/bin:/opt/solr/cross-dc-manager/bin:$PATH" \
     SOLR_INCLUDE=/etc/default/solr.in.sh \
     SOLR_HOME=/var/solr/data \
     SOLR_PID_DIR=/var/solr \

Relevant Maintainers:

@yosifkit yosifkit merged commit 8189ce0 into docker-library:master Jan 21, 2025
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants