diff options
author | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-03-01 10:59:28 -0500 |
---|---|---|
committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-03-01 10:59:28 -0500 |
commit | 632987493c6c24532b2ec526b17daf73ee6d21f0 (patch) | |
tree | b27efd6f9d621122c9fcab4e0e32c7ad11bb08c2 /installation/ubuntu | |
parent | 33314626c3c8cf06a364deb11dfb6f006aed5d82 (diff) |
Nitrogen port : sdnc-oam
Update sdnc-oam to create docker containers based on
ODL Nitrogen release.
Change-Id: If8df28c417a2dec69be6eee2fc4521541126085a
Issue-ID: SDNC-269
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Former-commit-id: 2822ea7882e20879b1556bf98cf28695f5052348
Diffstat (limited to 'installation/ubuntu')
-rw-r--r-- | installation/ubuntu/pom.xml | 134 | ||||
-rw-r--r-- | installation/ubuntu/src/main/docker/Dockerfile | 24 |
2 files changed, 0 insertions, 158 deletions
diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml deleted file mode 100644 index 4d8deb63..00000000 --- a/installation/ubuntu/pom.xml +++ /dev/null @@ -1,134 +0,0 @@ -<?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.sdnc.oam</groupId> - <artifactId>installation</artifactId> - <version>1.3.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation-ubuntu</artifactId> - <version>1.3.0-SNAPSHOT</version> - - <name>Installation - ubuntu</name> - <description>Creates base ubuntu Docker container</description> - - <properties> - <image.name>onap/ubuntu-sdnc-image</image.name> - <sdnc.project.version>${project.version}</sdnc.project.version> - </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> - println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = - project.properties['sdnc.project.version'].split('\\.'); - } - - if (project.properties['sdnc.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>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>generate-sources</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> - - <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> - <organization> - <name>openECOMP</name> - </organization> -</project> diff --git a/installation/ubuntu/src/main/docker/Dockerfile b/installation/ubuntu/src/main/docker/Dockerfile deleted file mode 100644 index 464d4c0a..00000000 --- a/installation/ubuntu/src/main/docker/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# Base ubuntu with added packages needed for open ecomp -FROM ubuntu:16.04 -MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) - -ARG HTTP_PROXY -ARG HTTPS_PROXY - -ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} - -RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ - if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi - -# Add tools needed for OpenDaylight -RUN apt-get update && apt-get install -y git \ - graphviz \ - openjdk-8-jdk \ - maven \ - mysql-client \ - nodejs \ - nodejs-legacy \ - npm \ - python-pip \ - unzip |