DOCKER-441 improve solr backup documentation and add new env variable…

… for backup and ALFRESCO_SECRET
xenit-eu · Nov 6, 2023 · b692973 · b692973
1 parent e6ad284
commit b692973
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -7,24 +7,27 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 ### Added
-* [DOCKER-440] replace 2.0.8.1 with 2.0.8.2
-
-### Added
+* [DOCKER-441] improve solr backup documentation and add new env variable for backup and ALFRESCO_SECRET  [#97]
+* [DOCKER-440] replace 2.0.8.1 with 2.0.8.2  [#96]
 * [DOCKER-438] DOCKER-438 add back solr 2.0.6  [#95]
-
-### Added
 * [DOCKER-438] upgrade solr from 2.0.6 to 2.0.8.1 [#91]
 
+[#96]: https://github.com/xenit-eu/docker-solr/pull/97
+[#96]: https://github.com/xenit-eu/docker-solr/pull/96
+[#95]: https://github.com/xenit-eu/docker-solr/pull/95
+[#91]: https://github.com/xenit-eu/docker-solr/pull/91
+
+
 ### Fixed
 * [XM2C-91] fix backup for latest ass remove core from solr backup dir and move backup location outside of data [#76]
 
-  [#76]: https://github.com/xenit-eu/docker-solr/pull/76
+[#76]: https://github.com/xenit-eu/docker-solr/pull/76
 
 ### Added
 
 * [DOCKER-426] upgrade solr from 2.0.3 to 2.0.6 [#74]
 
-  [#74]: https://github.com/xenit-eu/docker-solr/pull/74
+[#74]: https://github.com/xenit-eu/docker-solr/pull/74
 
 ### Removed
 * [DOCKER-391] Deprecate solr1 [#57]

diff --git a/README.md b/README.md
@@ -62,6 +62,7 @@ See also environment variables from lower layers: [`docker-openjdk`](https://git
 | ALFRESCO_PORT                              | alfresco.port                   |               | 8080                                                           |                                                                                                                                                                                     |
 | ALFRESCO_PORT_SSL                          | alfresco.port.ssl               |               | 8443                                                           |                                                                                                                                                                                     |
 | ALFRESCO_SSL                               | alfresco.secureComms            |               | https                                                          | changes also server.xml for tomcat-based images and solr.in.sh for jetty-based images                                                                                               |
+| ALFRESCO_SECRET                            | alfresco.secureComms.secret     |               | none                                                           | to be set when ALFRESSCO_SSL is secret to setup the shared secret between solr and alfresco                                                                                         |
 | ALFRESCO_ENABLE_TRACKING                   | enable.alfresco.tracking        |               | true                                                           | in the workspace core or shard                                                                                                                                                      |
 | ALFRESCO_INDEX_CONTENT                     | alfresco.index.transformContent |               | true                                                           | in the workspace core or shard                                                                                                                                                      |
 | ALFRESCO_CORE_POOL_SIZE                    | alfresco.corePoolSize           |               | 8                                                              |                                                                                                                                                                                     |

diff --git a/build.gradle b/build.gradle
@@ -30,7 +30,7 @@ def calcTags(version) {
 }
 
 def calcRepository(flavor, enterprise, customized) {
-    def repoName = (enterprise ? "private.docker.xenit.eu/alfresco-enterprise" : "docker.io/xenit")
+    def repoName = (enterprise ? "sandbox.docker.xenit.eu/alfresco-enterprise" : "docker.io/xenit")
     if (customized)
         return "${repoName}/alfresco-${flavor}-xenit"
     else

diff --git a/upstream/solr6/local/92-init-solr.sh b/upstream/solr6/local/92-init-solr.sh
@@ -93,8 +93,8 @@ function createCoreStatically {
   setOption 'alfresco.port' "${ALFRESCO_PORT:-8080}" "$CONFIG_FILE_CORE"
   setOption 'alfresco.port.ssl' "${ALFRESCO_PORT_SSL:-8443}" "$CONFIG_FILE_CORE"
   setOption 'alfresco.secureComms' "$ALFRESCO_SSL" "$CONFIG_FILE_CORE"
-  if [ "$ALFRESCO_SSL" == "secret" ] && [ -z ${ALFRESCO_SECRET} ]; then
-    setOption 'alfresco.secureComms.secret' "$ALFRESCO_SECRET" "$CONFIG_FILE_CORE"
+  if [ "$ALFRESCO_SSL" == "secret" ] && [[ -n ${ALFRESCO_SECRET} ]]; then
+    setJavaOption 'alfresco.secureComms.secret' "-Dalfresco.secureComms.secret=$ALFRESCO_SECRET"
   fi
 }