From 919ca543e8d97a29cf4606d1b55d24843c3ee79f Mon Sep 17 00:00:00 2001
From: "Damian.Ujma@hyland.com" <Damian.Ujma@hyland.com>
Date: Fri, 29 Jul 2022 11:46:00 +0200
Subject: [PATCH] ACS-3348 Remove unrecognized VM options

---
 search-services/alfresco-search/pom.xml         | 2 +-
 search-services/packaging/config.properties     | 1 +
 search-services/packaging/pom.xml               | 3 +++
 search-services/packaging/src/docker/Dockerfile | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml
index 160c33596..a41614189 100644
--- a/search-services/alfresco-search/pom.xml
+++ b/search-services/alfresco-search/pom.xml
@@ -441,7 +441,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+				<version>0.8.8</version>
 				<configuration>
 					<excludes>
 						<exclude>**/AnnotationWriter.*</exclude>
diff --git a/search-services/packaging/config.properties b/search-services/packaging/config.properties
index 24a6a3984..b2def0508 100644
--- a/search-services/packaging/config.properties
+++ b/search-services/packaging/config.properties
@@ -4,6 +4,7 @@ alfresco.search.logs=SOLR_LOGS_DIR=../../logs\
 ${line.separator}LOG4J_PROPS=$SOLR_LOGS_DIR/log4j.properties
 alfresco.gc.logs=GC_LOG_OPTS=""
 alfresco.gc.logs.win=REM set "GC_LOG_OPTS= "
+alfresco.gc.tune=GC_TUNE="-XX:NewRatio=3 -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=8 -XX:ConcGCThreads=4 -XX:ParallelGCThreads=4 -XX:PretenureSizeThreshold=64m -XX:+ParallelRefProcEnabled -XX:-OmitStackTraceInFastThrow"
 alfresco.search.logs.win=set SOLR_LOGS_DIR=..\\..\\logs\
 ${line.separator}set LOG4J_CONFIG=file:!SOLR_LOGS_DIR!\\log4j.properties
 alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index 43fe2d0c0..a9d65929d 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -214,6 +214,9 @@
                                 <replace token="GC logging" value="GC logging${line.separator}${alfresco.gc.logs.win}" dir="${solr.directory}">
                                     <include name="**/bin/solr.in.cmd" />
                                 </replace>
+                                <replace token="#GC_TUNE=&quot;-XX:NewRatio=3 -XX:SurvivorRatio=4    etc." value="${alfresco.gc.tune}" dir="${solr.directory}">
+                                    <include name="**/bin/solr.in.sh" />
+                                </replace>
                                 <replace token="# Anything you add to the SOLR_OPTS" value="${alfresco.search.config}${line.separator}${line.separator}# Anything you add to the SOLR_OPTS" dir="${solr.directory}">
                                     <include name="**/bin/solr.in.sh" />
                                 </replace>
diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile
index f4d0d58c8..c5acae104 100644
--- a/search-services/packaging/src/docker/Dockerfile
+++ b/search-services/packaging/src/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Alfresco Search Services ${project.version} Docker Image
 
-FROM alfresco/alfresco-base-java:jre17-rockylinux8
+FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835
 LABEL creator="Alfresco" maintainer="Alfresco"
 
 ENV DIST_DIR /opt/alfresco-search-services