Apache Solr open-source search software
Fix official dockerfile sources and add build steps to RC message (#773)
Houston Putmanc84f373c860f
diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yamlindex b64382f341c..40cf2f3ff2b 100644--- a/dev-tools/scripts/releaseWizard.yaml+++ b/dev-tools/scripts/releaseWizard.yaml@@ -765,12 +765,20 @@ groups:Please vote for release candidate {{ rc_number }} for Solr {{ release_version }}The artifacts can be downloaded from:- {{ dist_url_base }}/solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}+ {{ release_candidate_location }}You can run the smoke tester directly with this command:python3 -u dev-tools/scripts/smokeTestRelease.py \- {{ dist_url_base }}/solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}+ {{ release_candidate_location }}++ You can build a release-candidate of the official docker image using the following command:++ DIST_BASE={{ dist_url_base }} && \+ RC_FOLDER={{ release_candidate_rc_folder }} && \+ docker build $DIST_BASE/$RC_FOLDER/solr/docker/Dockerfile.official \+ --build-arg SOLR_DOWNLOAD_URL=$DIST_BASE/$RC_FOLDER/solr/solr-{{ release_version }}.tgz \+ -t solr-rc:{{ release_version }}-{{ rc_number }}The vote will be open for at least 72 hours i.e. until {{ vote_close }}.@@ -793,6 +801,8 @@ groups:vars:vote_close: '{{ vote_close_72h }}'vote_close_epoch: '{{ vote_close_72h_epoch }}'+ release_candidate_rc_folder: 'solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}'+ release_candidate_location: '{{ dist_url_base }}/{{ release_candidate_rc_folder }}'persist_vars:- vote_close- vote_close_epochdiff --git a/solr/docker/templates/Dockerfile.official.header.template b/solr/docker/templates/Dockerfile.official.header.templateindex a8de667e479..8121d061500 100644--- a/solr/docker/templates/Dockerfile.official.header.template+++ b/solr/docker/templates/Dockerfile.official.header.template@@ -34,13 +34,13 @@ ARG SOLR_DOWNLOAD_URL# 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=http://www-eu.apache.org/dist/lucene/solr .+# 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?filename=solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz&action=download"-ARG SOLR_DIST_URL="https://www.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"-ARG SOLR_ARCHIVE_URL="https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"+ARG SOLR_CLOSER_URL="http://www.apache.org/dyn/closer.lua/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz?action=download"+ARG SOLR_DIST_URL="https://www.apache.org/dist/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; \