From: Dan Timoney Date: Thu, 10 Aug 2017 20:59:02 +0000 (-0400) Subject: Create base OpenDaylight container X-Git-Tag: v0.1.0~36 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=refs%2Fchanges%2F57%2F7257%2F4 Create base OpenDaylight container Create base ODL Carbon docker container, based on base Ubuntu docker container Change-Id: I11873727a6a436ff6ecc6113c927ab07f99a67a3 Issue-ID: CCSDK-27 Signed-off-by: Dan Timoney --- diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml new file mode 100644 index 00000000..c35546dc --- /dev/null +++ b/opendaylight/pom.xml @@ -0,0 +1,219 @@ + + + + + org.onap.ccsdk.distribution + distribution-root + 0.0.1-SNAPSHOT + + + 4.0.0 + pom + distribution-opendaylight + 0.0.1-SNAPSHOT + + Distribution - opendaylight + Creates OpenDaylight container + + + onap/ccsdk-odl-image + ${project.version} + 0.6.1-Carbon + 5.1.39 + ${https_proxy} + + + + + + org.opendaylight.integration + distribution-karaf + ${ccsdk.opendaylight.version} + tar.gz + + + mysql + mysql-connector-java + ${ccsdk.mysql-connector-java.version} + jar + + + + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + + println project.properties['ccsdk.project.version']; + def versionArray; + if ( project.properties['ccsdk.project.version'] != null ) { + versionArray = + project.properties['ccsdk.project.version'].split('\\.'); + } + + if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + } else { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + } + + println 'New Tag for docker:' + + project.properties['project.docker.latesttag.version']; + + + + + + + + io.fabric8 + docker-maven-plugin + 0.16.5 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + ${basedir}/target/docker-stage/Dockerfile + + ${project.version} + ${project.version}-STAGING-${maven.build.timestamp} + ${project.docker.latesttag.version} + + + + + + + + generate-images + package + + build + + + + + push-images + deploy + + build + push + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.0 + + + get-odl-distribution + validate + + copy + + + + + org.opendaylight.integration + distribution-karaf + ${ccsdk.opendaylight.version} + tar.gz + + true + ${basedir}/target/docker-stage + + + false + true + true + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.0 + + + get-mysql-connector-jar + validate + + copy + + + + + mysql + mysql-connector-java + ${ccsdk.mysql-connector-java.version} + jar + + true + ${basedir}/target/docker-stage + + + false + true + true + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + + + + + + + + + openECOMP + + diff --git a/opendaylight/src/main/docker/Dockerfile b/opendaylight/src/main/docker/Dockerfile new file mode 100644 index 00000000..35d1277b --- /dev/null +++ b/opendaylight/src/main/docker/Dockerfile @@ -0,0 +1,19 @@ +# Base ubuntu with added packages needed for open ecomp +FROM onap/ccsdk-ubuntu-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 + +# copy the opendaylight tar and expand +COPY distribution-karaf-${ccsdk.opendaylight.version}.tar.gz /tmp/ +RUN mkdir /opt/opendaylight \ + && tar zxvf /tmp/distribution-karaf-${ccsdk.opendaylight.version}.tar.gz --directory /opt/opendaylight \ + && rm -rf /tmp/distribution-karaf-${ccsdk.opendaylight.version}.tar.gz \ + && ln -s /opt/opendaylight/distribution-karaf-${ccsdk.opendaylight.version} /opt/opendaylight/current + + +# workaround till we get proxy working +RUN mkdir -p /opt/opendaylight/current/system/mysql/mysql-connector-java/${ccsdk.mysql-connector-java.version} +COPY mysql-connector-java-${ccsdk.mysql-connector-java.version}.jar /opt/opendaylight/current/system/mysql/mysql-connector-java/${ccsdk.mysql-connector-java.version} +# ENTRYPOINT exec /opt/opendaylight/current/bin/karaf +EXPOSE 8181 diff --git a/pom.xml b/pom.xml index 8c9e5eb8..7ed792e3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,5 +28,6 @@ ubuntu + opendaylight