XDOCKER-183: Fix Solr remote url property #31
Conversation
* replace the "solr.remote.url" usage with the "solr.remote.url" (newly added in the XWiki Standard code) * get rid of INDEX_HOST:INDEX_PORT costruction in favor of INDEX_BASEURL * update documentaion to point to the new needed JAR (solr-server-data replaced by the solr-server-core) * update the documentation to reflect the updates in the distribution
| file_env 'INDEX_HOST' 'localhost' | ||
| file_env 'INDEX_PORT' '8983' | ||
| file_env 'INDEX_BASEURL' 'http://localhost:8983/solr/xwiki' | ||
| file_env 'INDEX_TYPE' 'embedded' |
There was a problem hiding this comment.
I don't really understand why we need "INDEX_TYPE". Couldn't INDEX_BASEURL be an empty string by default and use that as criteria for example ?
There was a problem hiding this comment.
Actually forget that I'm fine with that since it's simply about following the standard configuration and someone might introduce a new type at some point.
README.md
Outdated
| @@ -586,8 +586,7 @@ The first time you create a container out of the xwiki image, a shell script (`/ | |||
| - `DB_PASSWORD`: The user password used by XWiki to read/write to the DB. | |||
| - `DB_DATABASE`: The name of the XWiki database to use/create. | |||
| - `DB_HOST`: The name of the host (or docker container) containing the database. Default is "db". | |||
| - `INDEX_HOST`: The hostname of an externally configured Solr instance. Defaults to "localhost", and configures an embedded Solr instance. | |||
| - `INDEX_PORT`: The port used by an externally configured Solr instance. Defaults to 8983. | |||
| - `INDEX_BASEURL`: The base URL of an externally configured Solr instance. Defaults to "http://localhost:8983/solr/xwiki", and configures an embedded Solr instance | |||
There was a problem hiding this comment.
This would fail the official dockerhub image best practices. It requires a tab.
* fix indentation to use tab, following the dockerhub image best practices.
|
@acotiuga I think this PR breaks backward compatibility and anyone using the XWiki docker image with the |
|
@vmassol You are right here. What can I do is to add back the old way of building the solr remote URL and, in addition, to use the new property and use it as standard with default to the old ones. Also , I would update the documentation accordingly. |
Sounds good, thanks |
solr.remote.urlusage with thesolr.remote.baseURL(newly added in the XWiki Standard code)INDEX_HOST:INDEX_PORTconstruction in favor ofINDEX_BASEURL