DOCKER-450 [Test] local build works

xenit-eu · May 24, 2024 · 45a87b1 · 45a87b1
1 parent ccfdbc3
commit 45a87b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/tomcat-base/build.gradle b/tomcat-base/build.gradle
@@ -101,11 +101,7 @@ subprojects {
     }
 
     createDockerFile {
-        if (!tomcatVersion.contains("10")) {
-            from 'docker.io/eclipse-temurin:11'
-        } else {
-            from 'docker.io/eclipse-temurin:17-jre'
-        }
+        from 'docker.io/eclipse-temurin:17-jre'
         smartCopy configurations.sharedLibs, '/usr/local/tomcat/shared/lib/'
         smartCopy "${project.parent.projectDir}/src/shared/main/resources/keystore", '/keystore'
         smartCopy configurations.runtimeClasspath, '/app/tomcat-embedded/lib'

diff --git a/...main/java/eu/xenit/alfresco/tomcat/embedded/alfresco/tomcat/AlfrescoTomcatCustomizer.java b/...main/java/eu/xenit/alfresco/tomcat/embedded/alfresco/tomcat/AlfrescoTomcatCustomizer.java
@@ -7,6 +7,7 @@
 import eu.xenit.alfresco.tomcat.embedded.config.TomcatConfiguration;
 import eu.xenit.alfresco.tomcat.embedded.tomcat.TomcatCustomizer;
 import org.apache.catalina.startup.Tomcat;
+
 public class AlfrescoTomcatCustomizer implements TomcatCustomizer {
 
     @Override