diff --git a/Dockerfile b/Dockerfile index 1bf28b6b..adab9025 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN yum update -y \ RUN yum install -y wget tar unzip dos2unix patch ARG GROUPER_CONTAINER_VERSION -ENV GROUPER_VERSION=2.6.6 \ +ENV GROUPER_VERSION=2.6.7 \ GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION # Install Corretto Java JDK @@ -32,7 +32,7 @@ RUN echo 'Installing Grouper'; \ cd /opt/grouper/$GROUPER_VERSION/ \ && $JAVA_HOME/bin/java -cp :grouperInstaller.jar edu.internet2.middleware.grouperInstaller.GrouperInstaller FROM centos:centos7 as cleanup -ENV GROUPER_VERSION=2.6.6 \ +ENV GROUPER_VERSION=2.6.7 \ TOMEE_VERSION=7.0.0 RUN mkdir -p /opt/grouper/grouperWebapp/ RUN mkdir -p /opt/tomee/ @@ -95,7 +95,9 @@ COPY container_files/httpd/* /etc/httpd/conf.d/ COPY container_files/shibboleth/* /etc/shibboleth/ RUN cp /dev/null /etc/httpd/conf.d/ssl.conf RUN rm -f /opt/tomee/bin/log4j-* -COPY container_files/tier-support/log4j_fix/* /opt/tomee/bin/ +COPY container_files/tier-support/log4j_fix/log4j-* /opt/tomee/bin/ +RUN rm -f /opt/tomee/lib/slf4j-* +COPY container_files/tier-support/log4j_fix/slf4j-* /opt/tomee/lib/ # this is to improve openshift diff --git a/container_files/tier-support/log4j_fix/log4j-api-2.17.0.jar b/container_files/tier-support/log4j_fix/log4j-api-2.17.1.jar similarity index 70% rename from container_files/tier-support/log4j_fix/log4j-api-2.17.0.jar rename to container_files/tier-support/log4j_fix/log4j-api-2.17.1.jar index e39dab0d..605c45d0 100644 Binary files a/container_files/tier-support/log4j_fix/log4j-api-2.17.0.jar and b/container_files/tier-support/log4j_fix/log4j-api-2.17.1.jar differ diff --git a/container_files/tier-support/log4j_fix/log4j-core-2.17.0.jar b/container_files/tier-support/log4j_fix/log4j-core-2.17.1.jar similarity index 78% rename from container_files/tier-support/log4j_fix/log4j-core-2.17.0.jar rename to container_files/tier-support/log4j_fix/log4j-core-2.17.1.jar index b853057e..bbead126 100644 Binary files a/container_files/tier-support/log4j_fix/log4j-core-2.17.0.jar and b/container_files/tier-support/log4j_fix/log4j-core-2.17.1.jar differ diff --git a/container_files/tier-support/log4j_fix/log4j-jul-2.17.0.jar b/container_files/tier-support/log4j_fix/log4j-jul-2.17.1.jar similarity index 72% rename from container_files/tier-support/log4j_fix/log4j-jul-2.17.0.jar rename to container_files/tier-support/log4j_fix/log4j-jul-2.17.1.jar index 44c8ea26..bab94c2b 100644 Binary files a/container_files/tier-support/log4j_fix/log4j-jul-2.17.0.jar and b/container_files/tier-support/log4j_fix/log4j-jul-2.17.1.jar differ diff --git a/container_files/tier-support/log4j_fix/slf4j-api-1.7.32.jar b/container_files/tier-support/log4j_fix/slf4j-api-1.7.32.jar new file mode 100644 index 00000000..b16a0785 Binary files /dev/null and b/container_files/tier-support/log4j_fix/slf4j-api-1.7.32.jar differ diff --git a/container_files/tier-support/log4j_fix/slf4j-jdk14-1.7.32.jar b/container_files/tier-support/log4j_fix/slf4j-jdk14-1.7.32.jar new file mode 100644 index 00000000..c38b303c Binary files /dev/null and b/container_files/tier-support/log4j_fix/slf4j-jdk14-1.7.32.jar differ