X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=opendaylight%2Fsulfur%2Fsulfur-alpine%2Fsrc%2Fmain%2Fdocker%2FDockerfile;fp=opendaylight%2Fsilicon%2Fsilicon-alpine%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=4201b83e745cf40327ed2246700fea2dc37ecc48;hp=19cd55f6903fb4d6630ea435029c54187ea5b619;hb=b62ae2e4a975ae0531426d7f02a2face4ca12bfc;hpb=8b583df562d47c7d5190f22fe35845fd50820477

diff --git a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile b/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile
similarity index 75%
rename from opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
rename to opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile
index 19cd55f6..4201b83e 100644
--- a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile
@@ -21,20 +21,13 @@ RUN sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL
     && addgroup odl wheel
 
 # Patch some opendaylight artifacts
-COPY system $ODL_HOME/system
+#COPY system $ODL_HOME/system
 
 # Add missing scripts see SDNC-1056
 #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