reverted docker base image to standard tomcat. added timeouts for rest client in ImageResource

Author: vlahoda

gradle.properties

@@ -1,2 +1,2 @@
 group=cz.incad.kramerius
-version=7.0.33-dev
+version=7.0.33-devtomcat2

rest/src/main/java/cz/incad/kramerius/rest/apiNew/client/v70/ItemsResource.java

@@ -64,6 +64,7 @@
 import javax.inject.Named;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
+import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.PathSegment;
@@ -207,6 +208,8 @@ public class ItemsResource extends ClientApiResource {
     public ItemsResource() {
         super();
         this.c = Client.create();
+        this.c.setConnectTimeout(5000);
+        this.c.setReadTimeout(10000);
     }
 
 

search/build.gradle

@@ -129,8 +129,8 @@ repositories {
 
 jib {
     from {
-        //image = 'tomcat:9.0.67-jre11-temurin-jammy'
-        image = 'bitnami/tomcat:9.0.75'
+        image = 'tomcat:9.0.87-jre11-temurin-jammy'
+        //image = 'bitnami/tomcat:9.0.75'
         platforms {
             platform {
                 architecture = 'amd64'
@@ -146,9 +146,9 @@ jib {
         image = "ceskaexpedice/kramerius:${version}"
     }
     container {
-        //appRoot = '/usr/local/tomcat/webapps/search'
-        appRoot = '/opt/bitnami/tomcat/webapps/search'
-        user = '1001'
+        appRoot = '/usr/local/tomcat/webapps/search'
+        //appRoot = '/opt/bitnami/tomcat/webapps/search'
+        user = '0'
     }
 }