diff options
| -rw-r--r-- | opendaylight/carbon/pom.xml | 222 | ||||
| -rw-r--r-- | opendaylight/carbon/src/main/docker/Dockerfile (renamed from opendaylight/src/main/docker/Dockerfile) | 0 | ||||
| -rw-r--r-- | opendaylight/nitrogen/pom.xml | 222 | ||||
| -rw-r--r-- | opendaylight/nitrogen/src/main/docker/Dockerfile | 19 | ||||
| -rw-r--r-- | opendaylight/pom.xml | 214 | ||||
| -rw-r--r-- | pom.xml | 4 |
6 files changed, 469 insertions, 212 deletions
diff --git a/opendaylight/carbon/pom.xml b/opendaylight/carbon/pom.xml new file mode 100644 index 00000000..aab4f8e3 --- /dev/null +++ b/opendaylight/carbon/pom.xml @@ -0,0 +1,222 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-opendaylight</artifactId> + <version>0.2.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <packaging>pom</packaging> + <artifactId>distribution-odl-carbon</artifactId> + <version>0.2.0-SNAPSHOT</version> + + <name>Distribution - opendaylight</name> + <description>Creates OpenDaylight container</description> + + <properties> + <image.name>onap/ccsdk-odl-image</image.name> + <ccsdk.project.version>${project.version}</ccsdk.project.version> + <ccsdk.opendaylight.version>0.6.1-Carbon</ccsdk.opendaylight.version> + <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version> + <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.opendaylight.integration</groupId> + <artifactId>distribution-karaf</artifactId> + <version>${ccsdk.opendaylight.version}</version> + <type>tar.gz</type> + </dependency> + <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${ccsdk.mariadb-connector-java.version}</version> + <type>jar</type> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <plugins> + + + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + 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']; + </source> + </configuration> + </execution> + </executions> + </plugin> + + + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>get-odl-distribution</id> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.opendaylight.integration</groupId> + <artifactId>distribution-karaf</artifactId> + <version>${ccsdk.opendaylight.version}</version> + <type>tar.gz</type> + + <overWrite>true</overWrite> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + <execution> + <id>get-mariadb-connector-jar</id> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${ccsdk.mariadb-connector-java.version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-dockerfile</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + <includes> + <include>Dockerfile</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + + + </plugins> + + </build> + + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.16.5</version> + <inherited>false</inherited> + <configuration> + <images> + <image> + <name>${image.name}</name> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> + <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> + <tags> + <tag>${project.version}</tag> + <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> + <tag>${project.docker.latesttag.version}</tag> + </tags> + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <id>generate-images</id> + <phase>package</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + </profiles> + <organization> + <name>openECOMP</name> + </organization> + <groupId>org.onap.ccsdk.distribution</groupId> +</project> diff --git a/opendaylight/src/main/docker/Dockerfile b/opendaylight/carbon/src/main/docker/Dockerfile index c35a746f..c35a746f 100644 --- a/opendaylight/src/main/docker/Dockerfile +++ b/opendaylight/carbon/src/main/docker/Dockerfile diff --git a/opendaylight/nitrogen/pom.xml b/opendaylight/nitrogen/pom.xml new file mode 100644 index 00000000..d8518865 --- /dev/null +++ b/opendaylight/nitrogen/pom.xml @@ -0,0 +1,222 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-opendaylight</artifactId> + <version>0.2.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <packaging>pom</packaging> + <artifactId>distribution-odl-nitrogen</artifactId> + <version>0.2.0-SNAPSHOT</version> + + <name>Distribution - opendaylight</name> + <description>Creates OpenDaylight container</description> + + <properties> + <image.name>onap/ccsdk-odl-nitrogen-image</image.name> + <ccsdk.project.version>${project.version}</ccsdk.project.version> + <ccsdk.opendaylight.version>0.7.1</ccsdk.opendaylight.version> + <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version> + <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.opendaylight.integration</groupId> + <artifactId>karaf</artifactId> + <version>${ccsdk.opendaylight.version}</version> + <type>tar.gz</type> + </dependency> + <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${ccsdk.mariadb-connector-java.version}</version> + <type>jar</type> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <plugins> + + + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + 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']; + </source> + </configuration> + </execution> + </executions> + </plugin> + + + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>get-odl-distribution</id> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.opendaylight.integration</groupId> + <artifactId>karaf</artifactId> + <version>${ccsdk.opendaylight.version}</version> + <type>tar.gz</type> + + <overWrite>true</overWrite> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + + <execution> + <id>get-mariadb-connector-jar</id> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${ccsdk.mariadb-connector-java.version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-dockerfile</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + <includes> + <include>Dockerfile</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + + + </plugins> + + </build> + + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.16.5</version> + <inherited>false</inherited> + <configuration> + <images> + <image> + <name>${image.name}</name> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> + <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> + <tags> + <tag>${project.version}</tag> + <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> + <tag>${project.docker.latesttag.version}</tag> + </tags> + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <id>generate-images</id> + <phase>package</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + </profiles> + <organization> + <name>openECOMP</name> + </organization> +</project> diff --git a/opendaylight/nitrogen/src/main/docker/Dockerfile b/opendaylight/nitrogen/src/main/docker/Dockerfile new file mode 100644 index 00000000..7e66a61a --- /dev/null +++ b/opendaylight/nitrogen/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 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/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version} +COPY mariadb-java-client-${ccsdk.mariadb-connector-java.version}.jar /opt/opendaylight/current/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version} +# ENTRYPOINT exec /opt/opendaylight/current/bin/karaf +EXPOSE 8181 diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index f17187a9..46d98bf5 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -16,214 +16,8 @@ <name>Distribution - opendaylight</name> <description>Creates OpenDaylight container</description> - <properties> - <image.name>onap/ccsdk-odl-image</image.name> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.opendaylight.version>0.6.1-Carbon</ccsdk.opendaylight.version> - <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version> - <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.opendaylight.integration</groupId> - <artifactId>distribution-karaf</artifactId> - <version>${ccsdk.opendaylight.version}</version> - <type>tar.gz</type> - </dependency> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>${ccsdk.mariadb-connector-java.version}</version> - <type>jar</type> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <plugins> - - - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source> - 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']; - </source> - </configuration> - </execution> - </executions> - </plugin> - - - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>get-odl-distribution</id> - <phase>validate</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.opendaylight.integration</groupId> - <artifactId>distribution-karaf</artifactId> - <version>${ccsdk.opendaylight.version}</version> - <type>tar.gz</type> - - <overWrite>true</overWrite> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - </artifactItem> - </artifactItems> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>get-mariadb-connector-jar</id> - <phase>validate</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>${ccsdk.mariadb-connector-java.version}</version> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - </artifactItem> - </artifactItems> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-dockerfile</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>src/main/docker</directory> - <includes> - <include>Dockerfile</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - - - - </plugins> - - </build> - - <profiles> - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.16.5</version> - <inherited>false</inherited> - <configuration> - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> - <tags> - <tag>${project.version}</tag> - <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - - </profiles> - <organization> - <name>openECOMP</name> - </organization> + <modules> + <module>carbon</module> + <module>nitrogen</module> + </modules> </project> @@ -4,8 +4,8 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-carbon-sr1</artifactId> - <version>0.1.1-SNAPSHOT</version> + <artifactId>odlparent-lite</artifactId> + <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> |