X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=8ba16f01809575e3cf493394b8ea043ba340d5d3;hp=4e6afa77f70e1aee47a59af65fcef0429accfc23;hb=268c5e1bbc6a14e79dca339566c1541b94c7a303;hpb=f01ae0e5c64cb98121697890a23b52317b37b7f4

diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile
index 4e6afa77..8ba16f01 100644
--- a/odlsli/src/main/docker/Dockerfile
+++ b/odlsli/src/main/docker/Dockerfile
@@ -1,26 +1,53 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-odl-image:${project.version}
-MAINTAINER CCSDK Team (onap-ccsdk@lists.openecomp.org)
+FROM onap/ccsdk-odl-oxygen-image:${project.version}
+MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.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
+ENV ODL_HOME /opt/opendaylight
+ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
+ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.core.version}/xml/features
+ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.version}/xml/features
+ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features
+ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features
+ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features
+ENV ANSIBLE_GPG_KEY ${ansible.gpg.key}
 
-# 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 $ODL_HOME/data
 
-COPY idmlight.db.mv.db /opt/opendaylight/current
 
-# copy openecomp
+# copy CCSDK mvn artifacts to ODL repository
+COPY system /tmp/system
+RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system
+
+# Add CCSDK repositories to boot repositories
+RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
+RUN cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|" > $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN echo featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all >> $ODL_HOME/etc/org.apache.karaf.features.cfg
+
+# Create odl user
+RUN useradd odl
+
+# Install ansible
+#COPY ansible-sources.list /etc/apt/sources.list.d
+#RUN gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv ${ANSIBLE_GPG_KEY} && \
+#    gpg --export --armor ${ANSIBLE_GPG_KEY} | apt-key add - && \
+#    apt-get update && \
+#    apt-get install -y ansible
+
+# Install ansible-opendaylight
+#RUN ansible-galaxy install git+https://git.opendaylight.org/gerrit/integration/packaging/ansible-opendaylight
+
+# Copy ccsdk install playbook
+#COPY install_ccsdk.yml /tmp
+
+# Install features in ODL
+#RUN ansible-playbook -i "localhost," -c local /tmp/install_ccsdk.yml
+
+
+# copy deliverables to opt
 COPY opt /opt
-RUN ln -s /opt/onap/sdnc /opt/sdnc
+COPY org.ops4j.pax.logging.cfg /opt/opendaylight/etc/org.ops4j.pax.logging.cfg
+
 
-# 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
+ENTRYPOINT /opt/onap/ccsdk/bin/startODL.sh
 EXPOSE 8181