From e8ca5888843e887abde90e8eb5b40f182f6a888f Mon Sep 17 00:00:00 2001
From: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com>
Date: Fri, 17 Dec 2021 12:43:05 +0100
Subject: [PATCH] [Solr] Remove breached class from log4j-core.jar (#4390)

---
 data/Dockerfiles/solr/Dockerfile | 5 +++++
 docker-compose.yml               | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/data/Dockerfiles/solr/Dockerfile b/data/Dockerfiles/solr/Dockerfile
index 6dfec41f7..06299257d 100644
--- a/data/Dockerfiles/solr/Dockerfile
+++ b/data/Dockerfiles/solr/Dockerfile
@@ -16,10 +16,15 @@ RUN dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
   tzdata \
   curl \
   bash \
+  zip \
   && apt-get autoclean \
   && rm -rf /var/lib/apt/lists/* \
   && chmod +x /solr.sh \
   && sync \
   && bash /solr.sh --bootstrap
+  
+RUN zip -q -d /opt/solr/server/lib/ext/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
+
+RUN apt remove zip -y  
 
 CMD ["/solr.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d7fe46f0..acd2ea158 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -523,7 +523,7 @@ services:
             - dockerapi
 
     solr-mailcow:
-      image: mailcow/solr:1.8
+      image: mailcow/solr:1.8.1
       restart: always
       volumes:
         - solr-vol-1:/opt/solr/server/solr/dovecot-fts/data:Z