summaryrefslogtreecommitdiffstats
path: root/odlsli/src/main
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-08-22 11:51:54 -0400
committerDan Timoney <dtimoney@att.com>2017-08-22 11:51:54 -0400
commit74e4e8dede50ffaf0d2209046959dea98b903c33 (patch)
tree42ab940752382af2ec668072cbc3a05c07417d1a /odlsli/src/main
parent471dafabda15677d67b5ef11ce2f4060b8c81f5b (diff)
Use docker profile
Docker plugin should be defined in separate profile so that it is only triggered by docker Jenkins jobs, which enable the docker profile via -P docker command line arg. Change-Id: I42826bf5fe1c4cfcf6dd0122b3d889ddd031306a Issue-ID: CCSDK-64 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'odlsli/src/main')
-rw-r--r--odlsli/src/main/docker/Dockerfile15
1 files changed, 2 insertions, 13 deletions
diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile
index 4e6afa77..b2a00f91 100644
--- a/odlsli/src/main/docker/Dockerfile
+++ b/odlsli/src/main/docker/Dockerfile
@@ -5,22 +5,11 @@ 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
-
+# 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}
# ENTRYPOINT exec /opt/opendaylight/current/bin/karaf
EXPOSE 8181