Update Solr to 8.10.0 #11000
Merged
Update Solr to 8.10.0 #11000
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
Diff for f00468f:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 17ec06f..f2ff0e1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -117,12 +117,22 @@ Architectures: amd64, arm64v8
GitCommit: 2e73e7067302f889eb42ade28df4adaf3b527d95
Directory: 8.8/slim
-Tags: 8.9.0, 8.9, 8, latest
+Tags: 8.9.0, 8.9
Architectures: amd64, arm64v8
-GitCommit: a1a59aa9d3ef286fe1e046ddfd168c3c34720660
+GitCommit: b786d89646823e5250368cb25fa2f55fdc50ec7e
Directory: 8.9
-Tags: 8.9.0-slim, 8.9-slim, 8-slim, slim
+Tags: 8.9.0-slim, 8.9-slim
Architectures: amd64, arm64v8
-GitCommit: a1a59aa9d3ef286fe1e046ddfd168c3c34720660
+GitCommit: b786d89646823e5250368cb25fa2f55fdc50ec7e
Directory: 8.9/slim
+
+Tags: 8.10.0, 8.10, 8, latest
+Architectures: amd64, arm64v8
+GitCommit: c9e67796b9620b9f93973b2667837ae47cc83b8f
+Directory: 8.10
+
+Tags: 8.10.0-slim, 8.10-slim, 8-slim, slim
+Architectures: amd64, arm64v8
+GitCommit: c9e67796b9620b9f93973b2667837ae47cc83b8f
+Directory: 8.10/slim
diff --git a/_bashbrew-list b/_bashbrew-list
index bfb3d33..53bf848 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -58,5 +58,9 @@ solr:8.9
solr:8.9-slim
solr:8.9.0
solr:8.9.0-slim
+solr:8.10
+solr:8.10-slim
+solr:8.10.0
+solr:8.10.0-slim
solr:latest
solr:slim
diff --git a/solr_slim/Dockerfile b/solr_8.9-slim/Dockerfile
similarity index 100%
copy from solr_slim/Dockerfile
copy to solr_8.9-slim/Dockerfile
diff --git a/solr_8.0-slim/scripts/docker-entrypoint.sh b/solr_8.9-slim/scripts/docker-entrypoint.sh
similarity index 100%
copy from solr_8.0-slim/scripts/docker-entrypoint.sh
copy to solr_8.9-slim/scripts/docker-entrypoint.sh
diff --git a/solr_8.0-slim/scripts/init-var-solr b/solr_8.9-slim/scripts/init-var-solr
similarity index 100%
copy from solr_8.0-slim/scripts/init-var-solr
copy to solr_8.9-slim/scripts/init-var-solr
diff --git a/solr_8.0-slim/scripts/oom_solr.sh b/solr_8.9-slim/scripts/oom_solr.sh
similarity index 100%
copy from solr_8.0-slim/scripts/oom_solr.sh
copy to solr_8.9-slim/scripts/oom_solr.sh
diff --git a/solr_8.0-slim/scripts/precreate-core b/solr_8.9-slim/scripts/precreate-core
similarity index 100%
copy from solr_8.0-slim/scripts/precreate-core
copy to solr_8.9-slim/scripts/precreate-core
diff --git a/solr_8.0-slim/scripts/run-initdb b/solr_8.9-slim/scripts/run-initdb
similarity index 100%
copy from solr_8.0-slim/scripts/run-initdb
copy to solr_8.9-slim/scripts/run-initdb
diff --git a/solr_8.0-slim/scripts/solr-create b/solr_8.9-slim/scripts/solr-create
similarity index 100%
copy from solr_8.0-slim/scripts/solr-create
copy to solr_8.9-slim/scripts/solr-create
diff --git a/solr_8.0-slim/scripts/solr-demo b/solr_8.9-slim/scripts/solr-demo
similarity index 100%
copy from solr_8.0-slim/scripts/solr-demo
copy to solr_8.9-slim/scripts/solr-demo
diff --git a/solr_5-slim/scripts/solr-fg b/solr_8.9-slim/scripts/solr-fg
similarity index 100%
copy from solr_5-slim/scripts/solr-fg
copy to solr_8.9-slim/scripts/solr-fg
diff --git a/solr_8.0-slim/scripts/solr-foreground b/solr_8.9-slim/scripts/solr-foreground
similarity index 100%
copy from solr_8.0-slim/scripts/solr-foreground
copy to solr_8.9-slim/scripts/solr-foreground
diff --git a/solr_8.0-slim/scripts/solr-precreate b/solr_8.9-slim/scripts/solr-precreate
similarity index 100%
copy from solr_8.0-slim/scripts/solr-precreate
copy to solr_8.9-slim/scripts/solr-precreate
diff --git a/solr_8.0-slim/scripts/start-local-solr b/solr_8.9-slim/scripts/start-local-solr
similarity index 100%
copy from solr_8.0-slim/scripts/start-local-solr
copy to solr_8.9-slim/scripts/start-local-solr
diff --git a/solr_5-slim/scripts/stop-local-solr b/solr_8.9-slim/scripts/stop-local-solr
similarity index 100%
copy from solr_5-slim/scripts/stop-local-solr
copy to solr_8.9-slim/scripts/stop-local-solr
diff --git a/solr_5-slim/scripts/wait-for-solr.sh b/solr_8.9-slim/scripts/wait-for-solr.sh
similarity index 100%
copy from solr_5-slim/scripts/wait-for-solr.sh
copy to solr_8.9-slim/scripts/wait-for-solr.sh
diff --git a/solr_8.0-slim/scripts/wait-for-zookeeper.sh b/solr_8.9-slim/scripts/wait-for-zookeeper.sh
similarity index 100%
copy from solr_8.0-slim/scripts/wait-for-zookeeper.sh
copy to solr_8.9-slim/scripts/wait-for-zookeeper.sh
diff --git a/solr_latest/Dockerfile b/solr_8.9/Dockerfile
similarity index 100%
copy from solr_latest/Dockerfile
copy to solr_8.9/Dockerfile
diff --git a/solr_8.0-slim/scripts/docker-entrypoint.sh b/solr_8.9/scripts/docker-entrypoint.sh
similarity index 100%
copy from solr_8.0-slim/scripts/docker-entrypoint.sh
copy to solr_8.9/scripts/docker-entrypoint.sh
diff --git a/solr_8.0-slim/scripts/init-var-solr b/solr_8.9/scripts/init-var-solr
similarity index 100%
copy from solr_8.0-slim/scripts/init-var-solr
copy to solr_8.9/scripts/init-var-solr
diff --git a/solr_8.0-slim/scripts/oom_solr.sh b/solr_8.9/scripts/oom_solr.sh
similarity index 100%
copy from solr_8.0-slim/scripts/oom_solr.sh
copy to solr_8.9/scripts/oom_solr.sh
diff --git a/solr_8.0-slim/scripts/precreate-core b/solr_8.9/scripts/precreate-core
similarity index 100%
copy from solr_8.0-slim/scripts/precreate-core
copy to solr_8.9/scripts/precreate-core
diff --git a/solr_8.0-slim/scripts/run-initdb b/solr_8.9/scripts/run-initdb
similarity index 100%
copy from solr_8.0-slim/scripts/run-initdb
copy to solr_8.9/scripts/run-initdb
diff --git a/solr_8.0-slim/scripts/solr-create b/solr_8.9/scripts/solr-create
similarity index 100%
copy from solr_8.0-slim/scripts/solr-create
copy to solr_8.9/scripts/solr-create
diff --git a/solr_8.0-slim/scripts/solr-demo b/solr_8.9/scripts/solr-demo
similarity index 100%
copy from solr_8.0-slim/scripts/solr-demo
copy to solr_8.9/scripts/solr-demo
diff --git a/solr_5-slim/scripts/solr-fg b/solr_8.9/scripts/solr-fg
similarity index 100%
copy from solr_5-slim/scripts/solr-fg
copy to solr_8.9/scripts/solr-fg
diff --git a/solr_8.0-slim/scripts/solr-foreground b/solr_8.9/scripts/solr-foreground
similarity index 100%
copy from solr_8.0-slim/scripts/solr-foreground
copy to solr_8.9/scripts/solr-foreground
diff --git a/solr_8.0-slim/scripts/solr-precreate b/solr_8.9/scripts/solr-precreate
similarity index 100%
copy from solr_8.0-slim/scripts/solr-precreate
copy to solr_8.9/scripts/solr-precreate
diff --git a/solr_8.0-slim/scripts/start-local-solr b/solr_8.9/scripts/start-local-solr
similarity index 100%
copy from solr_8.0-slim/scripts/start-local-solr
copy to solr_8.9/scripts/start-local-solr
diff --git a/solr_5-slim/scripts/stop-local-solr b/solr_8.9/scripts/stop-local-solr
similarity index 100%
copy from solr_5-slim/scripts/stop-local-solr
copy to solr_8.9/scripts/stop-local-solr
diff --git a/solr_5-slim/scripts/wait-for-solr.sh b/solr_8.9/scripts/wait-for-solr.sh
similarity index 100%
copy from solr_5-slim/scripts/wait-for-solr.sh
copy to solr_8.9/scripts/wait-for-solr.sh
diff --git a/solr_8.0-slim/scripts/wait-for-zookeeper.sh b/solr_8.9/scripts/wait-for-zookeeper.sh
similarity index 100%
copy from solr_8.0-slim/scripts/wait-for-zookeeper.sh
copy to solr_8.9/scripts/wait-for-zookeeper.sh
diff --git a/solr_latest/Dockerfile b/solr_latest/Dockerfile
index aa9794d..688bc30 100644
--- a/solr_latest/Dockerfile
+++ b/solr_latest/Dockerfile
@@ -4,9 +4,9 @@ FROM openjdk:11-jre
LABEL maintainer="The Apache Lucene/Solr Project"
LABEL repository="https://github.com/docker-solr/docker-solr"
-ARG SOLR_VERSION="8.9.0"
-ARG SOLR_SHA512="15150b7f191fd9e8d2c1bd8bb619dd4b3f27af2e0e94b7609031f7e745a2e263391c30f68865c208afb97ccaa9bde6d16050200e9bfccef65f762c2ed743c242"
-ARG SOLR_KEYS="9722F25F650057E26C803B60A6D064D833B3A969"
+ARG SOLR_VERSION="8.10.0"
+ARG SOLR_SHA512="7bd884f9bb2ee0a632156996c710e8d755db34408b503093570bcef43c085d814b27e1f39fd78e6af7349e390b20e084923188a05876badedbad07e21e3a1757"
+ARG SOLR_KEYS="FBC25D7E1712025294FE66590A6AA179B9BBF45E"
# If specified, this will override SOLR_DOWNLOAD_SERVER and all ASF mirrors. Typically used downstream for custom builds
ARG SOLR_DOWNLOAD_URL
diff --git a/solr_slim/Dockerfile b/solr_slim/Dockerfile
index 30f997e..8360ab3 100644
--- a/solr_slim/Dockerfile
+++ b/solr_slim/Dockerfile
@@ -4,9 +4,9 @@ FROM openjdk:11-jre-slim
LABEL maintainer="The Apache Lucene/Solr Project"
LABEL repository="https://github.com/docker-solr/docker-solr"
-ARG SOLR_VERSION="8.9.0"
-ARG SOLR_SHA512="15150b7f191fd9e8d2c1bd8bb619dd4b3f27af2e0e94b7609031f7e745a2e263391c30f68865c208afb97ccaa9bde6d16050200e9bfccef65f762c2ed743c242"
-ARG SOLR_KEYS="9722F25F650057E26C803B60A6D064D833B3A969"
+ARG SOLR_VERSION="8.10.0"
+ARG SOLR_SHA512="7bd884f9bb2ee0a632156996c710e8d755db34408b503093570bcef43c085d814b27e1f39fd78e6af7349e390b20e084923188a05876badedbad07e21e3a1757"
+ARG SOLR_KEYS="FBC25D7E1712025294FE66590A6AA179B9BBF45E"
# If specified, this will override SOLR_DOWNLOAD_SERVER and all ASF mirrors. Typically used downstream for custom builds
ARG SOLR_DOWNLOAD_URL
|
|
The As you can see from the generated diff there, there were no load-bearing changes in the fixed commit value. |
|
Another way to look at that is via https://github.com/docker-solr/docker-solr/compare/a1a59aa9d3ef286fe1e046ddfd168c3c34720660..b786d89646823e5250368cb25fa2f55fdc50ec7e -- you can see that the contents of those two commits is identical. |
|
From the diff I don't see any |
|
I think we could add to the GitHub action and check that the commits come from the origin repo (and not from a fork) and warn when the commit doesn't match the branch in |
|
#11071 👀 💪 |
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.
See the official announcement which I'll paste here:
There were no docker-solr script updates. One change to docker-solr documentation.
This PR to official-images has one curious thing in which the git commit hash to 8.9 changed from a1a59aa9d3ef286fe1e046ddfd168c3c34720660 to b786d89646823e5250368cb25fa2f55fdc50ec7e
The rationale is that the older value was a mistake -- it was the commit in the PR to docker-solr. After it was merged, the commit hash on the master branch was something else, now reflected here. This begs the question -- does Docker Official Images actually do / verify anything with this git hash (apparently not), or is it there just for traceability or something else?