Apache Solr - Fix 8.11.2 URLs, and improve other version URLs (apache/solr-docker#17) #16134
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
|
+1 approved |
Diff for 4b28f91:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3449572..ff5e67d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,48 +1,48 @@
-Maintainers: The Apache Solr Project <[email protected]> (@asfbot), David Smiley (@dsmiley), Jan Høydahl (@janhoy), Houston Putman (@houstonputman)
+Maintainers: The Apache Solr Project <[email protected]> (@asfbot), Shalin Mangar (@shalinmangar), David Smiley (@dsmiley), Jan Høydahl (@janhoy), Houston Putman (@houstonputman)
GitRepo: https://github.com/apache/solr-docker.git
GitFetch: refs/heads/main
Tags: 8.11.2, 8.11, 8
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e743474ec59206f53e6c1003cc852f104b315d43
+GitCommit: e383a5513c30d1ff663cbb57a45134d5c407147f
Directory: 8.11
Tags: 8.11.2-slim, 8.11-slim, 8-slim
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e743474ec59206f53e6c1003cc852f104b315d43
+GitCommit: e383a5513c30d1ff663cbb57a45134d5c407147f
Directory: 8.11-slim
Tags: 9.0.0, 9.0
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e743474ec59206f53e6c1003cc852f104b315d43
+GitCommit: e383a5513c30d1ff663cbb57a45134d5c407147f
Directory: 9.0
Tags: 9.1.1, 9.1
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e743474ec59206f53e6c1003cc852f104b315d43
+GitCommit: e383a5513c30d1ff663cbb57a45134d5c407147f
Directory: 9.1
Tags: 9.2.1, 9.2
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e743474ec59206f53e6c1003cc852f104b315d43
+GitCommit: e383a5513c30d1ff663cbb57a45134d5c407147f
Directory: 9.2
Tags: 9.3.0, 9.3
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e743474ec59206f53e6c1003cc852f104b315d43
+GitCommit: e383a5513c30d1ff663cbb57a45134d5c407147f
Directory: 9.3
Tags: 9.3.0-slim, 9.3-slim
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e743474ec59206f53e6c1003cc852f104b315d43
+GitCommit: e383a5513c30d1ff663cbb57a45134d5c407147f
Directory: 9.3-slim
Tags: 9.4.1, 9.4, 9, latest
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e743474ec59206f53e6c1003cc852f104b315d43
+GitCommit: e383a5513c30d1ff663cbb57a45134d5c407147f
Directory: 9.4
Tags: 9.4.1-slim, 9.4-slim, 9-slim, slim
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e743474ec59206f53e6c1003cc852f104b315d43
+GitCommit: e383a5513c30d1ff663cbb57a45134d5c407147f
Directory: 9.4-slim
diff --git a/solr_8-slim/Dockerfile b/solr_8-slim/Dockerfile
index dd596fd..36d3663 100644
--- a/solr_8-slim/Dockerfile
+++ b/solr_8-slim/Dockerfile
@@ -28,8 +28,8 @@ ENV SOLR_USER="solr" \
SOLR_UID="8983" \
SOLR_GROUP="solr" \
SOLR_GID="8983" \
- SOLR_CLOSER_URL="http://www.apache.org/dyn/closer.lua?filename=lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz&action=download" \
- SOLR_DIST_URL="https://www.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz" \
+ SOLR_CLOSER_URL="https://www.apache.org/dyn/closer.lua/lucene/solr/${SOLR_VERSION}/solr-${SOLR_VERSION}.tgz?action=download" \
+ SOLR_DIST_URL="https://downloads.apache.org/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz" \
SOLR_ARCHIVE_URL="https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH" \
SOLR_INCLUDE=/etc/default/solr.in.sh \
diff --git a/solr_8/Dockerfile b/solr_8/Dockerfile
index 035afdb..b8c34b9 100644
--- a/solr_8/Dockerfile
+++ b/solr_8/Dockerfile
@@ -28,8 +28,8 @@ ENV SOLR_USER="solr" \
SOLR_UID="8983" \
SOLR_GROUP="solr" \
SOLR_GID="8983" \
- SOLR_CLOSER_URL="http://www.apache.org/dyn/closer.lua?filename=lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz&action=download" \
- SOLR_DIST_URL="https://www.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz" \
+ SOLR_CLOSER_URL="https://www.apache.org/dyn/closer.lua/lucene/solr/${SOLR_VERSION}/solr-${SOLR_VERSION}.tgz?action=download" \
+ SOLR_DIST_URL="https://downloads.apache.org/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz" \
SOLR_ARCHIVE_URL="https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH" \
SOLR_INCLUDE=/etc/default/solr.in.sh \
diff --git a/solr_9.0/Dockerfile b/solr_9.0/Dockerfile
index b91f112..a03fc00 100644
--- a/solr_9.0/Dockerfile
+++ b/solr_9.0/Dockerfile
@@ -33,7 +33,7 @@ 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://www.apache.org/dist/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; \
diff --git a/solr_9.1/Dockerfile b/solr_9.1/Dockerfile
index eab4939..6a58bf0 100644
--- a/solr_9.1/Dockerfile
+++ b/solr_9.1/Dockerfile
@@ -33,7 +33,7 @@ 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://www.apache.org/dist/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; \
diff --git a/solr_9.2/Dockerfile b/solr_9.2/Dockerfile
index a360ac3..597dd17 100644
--- a/solr_9.2/Dockerfile
+++ b/solr_9.2/Dockerfile
@@ -33,7 +33,7 @@ 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://www.apache.org/dist/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; \Relevant Maintainers:
|
|
+1 |
yosifkit
approved these changes
Jan 25, 2024
|
And welcome to the new Solr image maintainer, @shalinmangar 🎉 🎊 |
|
Why was Shalin added? I removed him a week ago |
It looks like they are still in the generator script that the bot used. |
|
#16114 (comment) relevant here too 😄
|
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.
Apache Solr:
Fix 8.11.2 URLs, and improve other version URLs (apache/solr-docker#17)
See apache/solr-docker@e383a55 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
mainbranch.