X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=a31fcff498cddbcc8ba70a84af91f82b6ee68b0e;hp=4e6afa77f70e1aee47a59af65fcef0429accfc23;hb=21821db0a395cec9ad0709f72bcaa58bbcb317bf;hpb=471dafabda15677d67b5ef11ce2f4060b8c81f5b

diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile
index 4e6afa77..a31fcff4 100644
--- a/odlsli/src/main/docker/Dockerfile
+++ b/odlsli/src/main/docker/Dockerfile
@@ -3,24 +3,15 @@ FROM onap/ccsdk-odl-image:${project.version}
 MAINTAINER CCSDK Team (onap-ccsdk@lists.openecomp.org)
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 ENV ODL_HOME /opt/opendaylight/current
-ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
-
-# copy the opendaylight tar and expand
-COPY distribution-karaf-${sdnc.opendaylight.version}.tar.gz /tmp/
-RUN mkdir /opt/opendaylight \
-    && tar zxvf /tmp/distribution-karaf-${sdnc.opendaylight.version}.tar.gz --directory /opt/opendaylight \
-    && rm -rf /tmp/distribution-karaf-${sdnc.opendaylight.version}.tar.gz \
-    && ln -s /opt/opendaylight/distribution-karaf-${sdnc.opendaylight.version} /opt/opendaylight/current \
-    && mkdir /opt/onap
+ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
 
+# copy the opendaylight credentials
 COPY idmlight.db.mv.db /opt/opendaylight/current
 
-# copy openecomp
+# copy deliverables to opt
 COPY opt /opt
-RUN ln -s /opt/onap/sdnc /opt/sdnc
 
-# workaround till we get proxy working
-RUN mkdir -p /opt/opendaylight/current/system/mysql/mysql-connector-java/${sdnc.mysql-connector-java.version}
-COPY mysql-connector-java-${sdnc.mysql-connector-java.version}.jar /opt/opendaylight/current/system/mysql/mysql-connector-java/${sdnc.mysql-connector-java.version}
+COPY org.ops4j.pax.logging.cfg /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
+
 # ENTRYPOINT exec /opt/opendaylight/current/bin/karaf
 EXPOSE 8181