diff options
| -rw-r--r-- | opendaylight/neon/neon-alpine/pom.xml | 183 | ||||
| -rw-r--r-- | opendaylight/neon/neon-alpine/src/main/docker/Dockerfile | 22 | ||||
| -rw-r--r-- | opendaylight/neon/pom.xml | 48 | ||||
| -rw-r--r-- | opendaylight/pom.xml | 4 |
4 files changed, 256 insertions, 1 deletions
diff --git a/opendaylight/neon/neon-alpine/pom.xml b/opendaylight/neon/neon-alpine/pom.xml new file mode 100644 index 00000000..70fd6945 --- /dev/null +++ b/opendaylight/neon/neon-alpine/pom.xml @@ -0,0 +1,183 @@ +<?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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-odl-neon</artifactId> + <version>0.5.0-SNAPSHOT</version> + </parent> + + <artifactId>distribution-odl-neon-alpine</artifactId> + <version>0.5.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name> + <description>Creates OpenDaylight container</description> + <organization> + <name>ONAP</name> + </organization> + + <properties> + <image.name>onap/ccsdk-odl-neon-alpine-image</image.name> + </properties> + <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>${basedir}/../../../src/main/scripts/TagVersion.groovy</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.28.0</version> + <inherited>false</inherited> + <configuration> + <images> + <image> + <name>${image.name}</name> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> + <dockerFile>Dockerfile</dockerFile> + <tags> + <tag>${project.docker.latestminortag.version}</tag> + <tag>${project.docker.latestfulltag.version}</tag> + <tag>${project.docker.latesttagtimestamp.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>${docker.push.phase}</phase> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + </profiles> +</project> diff --git a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile new file mode 100644 index 00000000..a043e1e9 --- /dev/null +++ b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile @@ -0,0 +1,22 @@ +# Base ubuntu with added packages needed for open ecomp +FROM onap/ccsdk-alpine-image:${project.docker.latestfulltag.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/neon/pom.xml b/opendaylight/neon/pom.xml new file mode 100644 index 00000000..145b18f1 --- /dev/null +++ b/opendaylight/neon/pom.xml @@ -0,0 +1,48 @@ +<?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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-opendaylight</artifactId> + <version>0.5.0-SNAPSHOT</version> + </parent> + + <artifactId>distribution-odl-neon</artifactId> + <version>0.5.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>ccsdk-distribution :: opendaylight</name> + <description>Creates OpenDaylight container</description> + + <properties> + <ccsdk.project.version>${project.version}</ccsdk.project.version> + <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> + <ccsdk.opendaylight.version>0.10.1</ccsdk.opendaylight.version> + <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version> + <docker.push.phase>deploy</docker.push.phase> + </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> + + + + <modules> + <module>neon-alpine</module> + </modules> +</project> diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index b5b0ed66..a2d12c5e 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -16,6 +16,8 @@ <description>Creates OpenDaylight container</description> <modules> - <module>fluorine</module> + <module>fluorine</module> + <module>neon</module> + </modules> </project> |