From 9b0e1e45e155e91614c008ecfadc83dadb6706d9 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 20 Dec 2018 13:40:40 -0500 Subject: [PATCH] Add base ODL Fluorine containers Add base docker containers for OpenDaylight Fluorine SR1 Change-Id: I6f203352adae5d4d70628be62818d6f5f96f1457 Issue-ID: CCSDK-860 Signed-off-by: Timoney, Dan (dt5972) --- opendaylight/fluorine/fluorine-alpine/pom.xml | 221 +++++++++++++++++++++ .../fluorine-alpine/src/main/docker/Dockerfile | 22 ++ opendaylight/fluorine/fluorine-ubuntu/pom.xml | 221 +++++++++++++++++++++ .../fluorine-ubuntu/src/main/docker/Dockerfile | 22 ++ opendaylight/fluorine/pom.xml | 22 ++ opendaylight/pom.xml | 1 + 6 files changed, 509 insertions(+) create mode 100644 opendaylight/fluorine/fluorine-alpine/pom.xml create mode 100644 opendaylight/fluorine/fluorine-alpine/src/main/docker/Dockerfile create mode 100644 opendaylight/fluorine/fluorine-ubuntu/pom.xml create mode 100644 opendaylight/fluorine/fluorine-ubuntu/src/main/docker/Dockerfile create mode 100644 opendaylight/fluorine/pom.xml diff --git a/opendaylight/fluorine/fluorine-alpine/pom.xml b/opendaylight/fluorine/fluorine-alpine/pom.xml new file mode 100644 index 00000000..7bcd5934 --- /dev/null +++ b/opendaylight/fluorine/fluorine-alpine/pom.xml @@ -0,0 +1,221 @@ + + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-opendaylight + 0.4.0-SNAPSHOT + + + distribution-odl-fluorine-alpine + 0.4.0-SNAPSHOT + pom + + ccsdk-distribution :: opendaylight :: ${project.artifactId} + Creates OpenDaylight container + + ONAP + + + + onap/ccsdk-odl-fluorine-alpine-image + ${project.version} + 0.9.1 + 2.1.1 + ${https_proxy} + deploy + + + + + + org.opendaylight.integration + karaf + ${ccsdk.opendaylight.version} + tar.gz + + + org.mariadb.jdbc + mariadb-java-client + ${ccsdk.mariadb-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']; + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.0 + + + get-odl-distribution + validate + + copy + + + + + org.opendaylight.integration + karaf + ${ccsdk.opendaylight.version} + tar.gz + + true + ${basedir}/target/docker-stage + + + false + true + true + + + + + get-mariadb-connector-jar + validate + + copy + + + + + org.mariadb.jdbc + mariadb-java-client + ${ccsdk.mariadb-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 + + + + + + + + + + + + + + + docker + + + + 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 + ${docker.push.phase} + + build + push + + + + + + + + + + + diff --git a/opendaylight/fluorine/fluorine-alpine/src/main/docker/Dockerfile b/opendaylight/fluorine/fluorine-alpine/src/main/docker/Dockerfile new file mode 100644 index 00000000..dc7736dd --- /dev/null +++ b/opendaylight/fluorine/fluorine-alpine/src/main/docker/Dockerfile @@ -0,0 +1,22 @@ +# Base ubuntu with added packages needed for open ecomp +FROM onap/ccsdk-alpine-image:${project.version} +MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) +ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk +ENV ODL_HOME /opt/opendaylight/current + +# copy the opendaylight tar and expand +COPY karaf-${ccsdk.opendaylight.version}.tar.gz /tmp/ +RUN mkdir -p /opt/odl \ + && tar zxvf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \ + && rm -rf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz \ + && mv /opt/odl/karaf-${ccsdk.opendaylight.version} /opt/opendaylight \ + && ln -s /opt/opendaylight /opt/opendaylight/karaf-${ccsdk.opendaylight.version} \ + && ln -s /opt/opendaylight /opt/opendaylight/current + + +# workaround till we get proxy working +RUN mkdir -p /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version} +COPY mariadb-java-client-${ccsdk.mariadb-connector-java.version}.jar /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version} + +# ENTRYPOINT exec /opt/opendaylight/bin/karaf +EXPOSE 8181 diff --git a/opendaylight/fluorine/fluorine-ubuntu/pom.xml b/opendaylight/fluorine/fluorine-ubuntu/pom.xml new file mode 100644 index 00000000..0d5fdca0 --- /dev/null +++ b/opendaylight/fluorine/fluorine-ubuntu/pom.xml @@ -0,0 +1,221 @@ + + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-opendaylight + 0.4.0-SNAPSHOT + + + distribution-odl-fluorine-ubuntu + 0.4.0-SNAPSHOT + pom + + ccsdk-distribution :: opendaylight :: ${project.artifactId} + Creates OpenDaylight container + + ONAP + + + + onap/ccsdk-odl-fluorine-ubuntu-image + ${project.version} + 0.9.1 + 2.1.1 + ${https_proxy} + deploy + + + + + + org.opendaylight.integration + karaf + ${ccsdk.opendaylight.version} + tar.gz + + + org.mariadb.jdbc + mariadb-java-client + ${ccsdk.mariadb-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']; + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.0 + + + get-odl-distribution + validate + + copy + + + + + org.opendaylight.integration + karaf + ${ccsdk.opendaylight.version} + tar.gz + + true + ${basedir}/target/docker-stage + + + false + true + true + + + + + get-mariadb-connector-jar + validate + + copy + + + + + org.mariadb.jdbc + mariadb-java-client + ${ccsdk.mariadb-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 + + + + + + + + + + + + + + + docker + + + + 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 + ${docker.push.phase} + + build + push + + + + + + + + + + + diff --git a/opendaylight/fluorine/fluorine-ubuntu/src/main/docker/Dockerfile b/opendaylight/fluorine/fluorine-ubuntu/src/main/docker/Dockerfile new file mode 100644 index 00000000..93811de9 --- /dev/null +++ b/opendaylight/fluorine/fluorine-ubuntu/src/main/docker/Dockerfile @@ -0,0 +1,22 @@ +# Base ubuntu with added packages needed for open ecomp +FROM onap/ccsdk-ubuntu-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 + +# copy the opendaylight tar and expand +COPY karaf-${ccsdk.opendaylight.version}.tar.gz /tmp/ +RUN mkdir /opt/odl \ + && tar zxvf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \ + && rm -rf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz \ + && mv /opt/odl/karaf-${ccsdk.opendaylight.version} /opt/opendaylight \ + && ln -s /opt/opendaylight /opt/opendaylight/karaf-${ccsdk.opendaylight.version} \ + && ln -s /opt/opendaylight /opt/opendaylight/current + + +# workaround till we get proxy working +RUN mkdir -p /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version} +COPY mariadb-java-client-${ccsdk.mariadb-connector-java.version}.jar /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version} + +# ENTRYPOINT exec /opt/opendaylight/bin/karaf +EXPOSE 8181 diff --git a/opendaylight/fluorine/pom.xml b/opendaylight/fluorine/pom.xml new file mode 100644 index 00000000..bcb07db7 --- /dev/null +++ b/opendaylight/fluorine/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-opendaylight + 0.4.0-SNAPSHOT + + + distribution-odl-fluorine + 0.4.0-SNAPSHOT + pom + + ccsdk-distribution :: opendaylight + Creates OpenDaylight container + + + fluorine-ubuntu + fluorine-alpine + + diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 4fa0bad2..f51bbbca 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -17,5 +17,6 @@ oxygen + fluorine -- 2.16.6