diff options
| author |   Dan Timoney <dtimoney@att.com> | 2021-12-16 16:25:49 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2022-01-04 10:17:08 -0500 |
| commit | 9738cbd82ca59fdd3108462507df31f4e219af81 (patch) | |
| tree | 8a43cef7ca988b4fc9e8bb40261a08333d1e6a5f /opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile | |
| parent | 4bd26f61d7684fe30f7aa86643c4cff3d241287d (diff) | |
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.17.1
Issue-ID: CCSDK-3556
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I3db01bf762f683807d555658610a6a0dade0504a
Diffstat (limited to 'opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile')
| -rw-r--r-- | opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile index 978a0919..19cd55f6 100644 --- a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile +++ b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile @@ -27,6 +27,14 @@ 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-logback/${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 |