Merge pull request 'Release v24.10' (!354) from release_24.10 into ma…

…ster

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "docs"]
+	path = docs
+	url = [email protected]:goobi-workflow/goobi-workflow-core-docs.git

Dockerfile

@@ -1,10 +1,14 @@
-FROM maven:3.9.3-eclipse-temurin-17 AS BUILD
-COPY . /goobi/
-WORKDIR /goobi
-RUN mvn clean package
+FROM maven:3.9.3-eclipse-temurin-17 AS build
+
+# you can use --build-arg build=false to skip workflow-core.war compilation, a workflow-core.war file needs to be available in target/workflow-core.war then
+ARG build=true
+
+COPY ./ /workflow/
+WORKDIR /workflow
+RUN echo $build; if [ "$build" = "true" ]; then mvn clean package; elif [ -f "/workflow/target/workflow-core.war" ]; then echo "using existing workflow-core.war"; else echo "not supposed to build, but no workflow-core.war found either"; exit 1; fi
 
 # Build actual application container
-FROM tomcat:8.5-jre8 as ASSEMBLE
+FROM tomcat:9-jre17 AS assemble
 LABEL maintainer="Matthias Geerdsen <[email protected]>"
 
 ENV DB_SERVER goobi-db
@@ -25,6 +29,11 @@ COPY install/docker/setenv.sh /usr/local/tomcat/bin/setenv.sh
 COPY install/docker/server.xml /usr/local/tomcat/conf/server.xml
 COPY install/docker/run.sh /run.sh
 COPY install/docker/log4j.xml /opt/digiverso/log4j.xml
+COPY install/docker/log4j2.xml /opt/digiverso/log4j.xml
+
+COPY install/docker/dummy.sh /opt/digiverso/goobi/scripts/
+RUN sed -i 's/^script_createSymLink=script_createSymLink.sh/script_createSymLink=dummy.sh/' /opt/digiverso/goobi/config/goobi_config.properties
+RUN sed -i 's/^script_deleteSymLink=script_deleteSymLink.sh/script_deleteSymLink=dummy.sh/' /opt/digiverso/goobi/config/goobi_config.properties
 
 RUN sed -i 's/TOMCATUSER=tomcat/TOMCATUSER=root/' /opt/digiverso/goobi/scripts/iii.sh
 
@@ -38,8 +47,13 @@ RUN apt-get update && \
         bc \
         rename \
         file \
-        mysql-client \
-        gettext-base && \
+        gettext-base \
+        libopenjp2-7 \
+        git \
+        fontconfig \
+        poppler-utils \
+        pdftk \
+        unzip && \
     apt-get -y clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     rm -rf ${CATALINA_HOME}/webapps/*
@@ -48,8 +62,8 @@ RUN apt-get update && \
 RUN mkdir ${CATALINA_HOME}/webapps/ROOT && \
     echo '<% response.sendRedirect("/goobi/"); %>' > ${CATALINA_HOME}/webapps/ROOT/index.jsp
 
-COPY --from=BUILD  target/workflow-core*.war /goobi.war
-RUN unzip /goobi.war -d /usr/local/tomcat/webapps/goobi && rm /goobi.war
+COPY --from=build  /workflow/target/*.war /
+RUN unzip /*.war -d /usr/local/tomcat/webapps/goobi && rm /*.war
 
 EXPOSE 8080
 CMD ["/run.sh"]