Installer should rename keyPass to keystorePass in Tomcat server.xml …

…file \(consequence of Tomcat 9 upgrade\)

Dockerfile

@@ -1,22 +1,29 @@
-FROM tomcat:jre8
+FROM ubuntu:trusty as builder
 
 LABEL maintainer="JoKneeMo <https://github.com/JoKneeMo>"
-LABEL version="8.11.9"
+LABEL version="8.11.10"
 
-ARG MAILARCHIVA_VERSION=8.11.9
+ARG MAILARCHIVA_VERSION=8.11.10
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt update && apt install -y \
     fontconfig-config \
     unzip \
-    && curl -so mailarchiva.war https://stimulussoft.b-cdn.net/mailarchiva_v${MAILARCHIVA_VERSION}.war \
     && curl -so javax2jakarta https://dlcdn.apache.org/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-shaded.jar \
-    && java -jar javax2jakarta mailarchiva.war mailarchiva-jakarta.war \
-    && unzip mailarchiva-jakarta.war -d $CATALINA_HOME/webapps/ROOT \
-    && sed -i 's|Connector port=\"8080\" protocol=\"HTTP\/1.1\"|Connector port=\"8080\" protocol=\"org.apache.coyote.http11.Http11NioProtocol\" URIEncoding=\"UTF-8\" compression=\"on\" noCompressionUserAgents=\"gozilla, traviata\" compressableMimeType=\"text/html,text/xml,text/css,text/plain,application/javascript,application/json\" enableLookups=\"false\"  disableUploadTimeout=\"true\" address=\"0.0.0.0\"|g' $CATALINA_HOME/conf/server.xml \
     && apt autoremove --purge -y \
     && apt clean \
-    && rm -rf mailarchiva.war mailarchiva-jakarta.war /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN curl -so mailarchiva.war https://stimulussoft.b-cdn.net/mailarchiva_v${MAILARCHIVA_VERSION}.war \
+    && java -jar javax2jakarta mailarchiva.war mailarchiva-jakarta.war
+
+
+FROM tomcat:jre8 as runtime
+
+COPY --from=builder mailarchiva-jakarta.war .
+
+RUN unzip mailarchiva-jakarta.war -d $CATALINA_HOME/webapps/ROOT \
+    && sed -i 's|Connector port=\"8080\" protocol=\"HTTP\/1.1\"|Connector port=\"8080\" protocol=\"org.apache.coyote.http11.Http11NioProtocol\" URIEncoding=\"UTF-8\" compression=\"on\" noCompressionUserAgents=\"gozilla, traviata\" compressableMimeType=\"text/html,text/xml,text/css,text/plain,application/javascript,application/json\" enableLookups=\"false\"  disableUploadTimeout=\"true\" address=\"0.0.0.0\"|g' $CATALINA_HOME/conf/server.xml \
     && rm -f mailarchiva.war mailarchiva-jakarta.war
 
 # Webserver

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   mailarchiva:
-    image: jokneemo/mailarchiva:8.11.9
+    image: jokneemo/mailarchiva:8.11.10
     restart: unless-stopped
     build:
       context: .