janhoy commented on code in PR #1563:
URL: https://github.com/apache/solr/pull/1563#discussion_r1242700026


##########
solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc:
##########
@@ -73,15 +73,24 @@ Please refer to the 
https://solr.apache.org/downloads.html[Solr Downloads] site
 === Shard Management
 * Solr now provides an 
xref:deployment-guide:shard-management.adoc#installsharddata["Install Shard"] 
API to allow users who have built (per-shard) indices offline to import them 
into SolrCloud shards.
 
-== Solr 9.3
 === Solr CLI
-* the bin/solr -i and bin/solr -info removed in favour of bin/solr status 
command.
+* The `bin/solr -i` and `bin/solr -info` options were removed in favour of the 
`bin/solr status` command.
 
 === Security
 * Use of `stream.file`, `stream.url` and `stream.body` params are no longer 
enabled via configuration in solrconfig.xml, nor dynamic equivalents with the 
config API.
 Older configuration now does nothing.
 Instead, set an env var: SOLR_ENABLE_REMOTE_STREAMING or 
SOLR_ENABLE_STREAM_BODY or system property equivalents.
 
+=== Official Docker Image
+* The customization of the Official Solr Dockerfile has been changed.
+The customization options `SOLR_DOWNLOAD_URL`, `SOLR_CLOSER_URL`, 
`SOLR_DIST_URL` and `SOLR_ARCHIVE_URL`, have been removed.
+The only way to specify a custom location for the Solr binaries is through 
`SOLR_DOWNLOAD_SERVER`.
+If the server URL contains `apache.org`, then the Dockerfile will check gpg 
signature files.
+If the server URL does not contain `apache.org`, then the gpg signature 
checking will be skipped.
++
+It is still strongly recommended to use the Dockerfile included Solr binary 
TGZs if you want to build Solr images with custom versions of Solr.

Review Comment:
   ```suggestion
   It is still strongly recommended to use the Dockerfile included in the Solr 
binary TGZs if you want to build Solr images with custom versions of Solr.
   ```



##########
solr/docker/templates/Dockerfile.official.header.template:
##########
@@ -21,72 +21,62 @@
 
 FROM _REPLACE_BASE_IMAGE_
 
-# TODO: remove things that exist solely for downstream specialization since 
Dockerfile.local now exists for that
-
 ARG SOLR_VERSION="_REPLACE_SOLR_VERSION_"
 # empty for the full distribution, "-slim" for the slim distribution
 ARG SOLR_DIST="_REPLACE_SOLR_DIST_"
 ARG SOLR_SHA512="_REPLACE_SOLR_TGZ_SHA_"
 ARG SOLR_KEYS="_REPLACE_RELEASE_MANAGER_GPG_FINGERPRINT_"
 
-# 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.:

Review Comment:
   ```suggestion
   # Override the default solr download location with a preferred mirror, e.g.:
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org

Reply via email to