From 3006f3a36ff67a0dfb4e50577be48883c80eeab6 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 16 Dec 2021 16:25:49 -0500 Subject: Patch OpenDaylight to upgrade to latest pax-logging package Patch OpenDaylight to replace the shipped version of pax-logging - which includes log4j-core v2.14.1 - with the latest version, which includes log4j-core v2.16.0 Issue-ID: CCSDK-3556 Signed-off-by: Dan Timoney Change-Id: I6728d686f74c9d4b277e388bac62cfa56c23392e --- opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile') diff --git a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile index 978a0919..b5b3c6da 100644 --- a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile +++ b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile @@ -27,6 +27,13 @@ COPY system $ODL_HOME/system #COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/ #RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt + +# Remove vulnerable version of ops4j logging +COPY framework-${odl.karaf.framework.version}-features.xml $ODL_HOME/system/org/apache/karaf/features/framework/${odl.karaf.framework.version}/framework-${odl.karaf.framework.version}-features.xml +COPY startup.properties $ODL_HOME/etc/startup.properties +RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-log4j2/${odl.pax.logging.version} +RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-api/${odl.pax.logging.version} + # Changing ownership and permission of /opt RUN chown -R odl:odl /opt && chmod -R 755 /opt -- cgit 1.2.3-korg