summaryrefslogtreecommitdiffstats
path: root/installation
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-04-24 16:30:26 -0400
committerDan Timoney <dtimoney@att.com>2017-04-24 16:30:38 -0400
commit8f77351687ce1bb10420c97ce40dd9fb73e6bd06 (patch)
treeaa7d17d9a2626f0a068cde2e5de0ec332d4d6e61 /installation
parent9e9f964cf18c0dfb9c21b5b655b0612221932070 (diff)
[SDNC-5] Docker tag
Update docker tags to match latest ONAP standards Change-Id: I5db0fa66dabc625f6fe5febdf5511a2d33b48c42 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 3be2dec90f877dbca6c9663410053ae7dd229179
Diffstat (limited to 'installation')
-rw-r--r--installation/admportal/pom.xml426
-rw-r--r--installation/dgbuilder/pom.xml41
-rw-r--r--installation/sdnc/pom.xml77
-rw-r--r--installation/ubuntu/pom.xml41
4 files changed, 382 insertions, 203 deletions
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 491af965..1f5c4201 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -1,198 +1,234 @@
<?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.openecomp.sdnc.oam</groupId>
- <artifactId>installation</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
- <groupId>org.openecomp.sdnc.oam</groupId>
- <artifactId>installation-admportal</artifactId>
- <version>1.1.0-SNAPSHOT</version>
-
- <name>Installation - admportal</name>
- <description>Creates admportal Docker container</description>
-
- <properties>
- <image.name>openecomp/admportal-sdnc-image</image.name>
- </properties>
-
-
- <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>latest</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>
- <execution>
- <id>copy-properties</id>
- <goals>
- <goal>copy-resources</goal>
- </goals><!-- here the phase you need -->
- <phase>validate</phase>
- <configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory>
- <resources>
- <resource>
- <directory>../src/main/properties</directory>
- <includes>
- <include>*.properties</include>
- <include>*.properties.sdnctldb01</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>exec-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- <version>1.5.0</version>
- <executions>
- <execution>
- <id>Unzip admportal</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>/usr/bin/unzip</executable>
- <arguments>
- <argument>-d</argument>
- <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
- <argument>../../admportal/target/*.zip</argument>
- </arguments>
- </configuration>
- </execution>
-
- <execution>
- <id>Copy admportal config</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>/bin/cp</executable>
- <arguments>
- <argument>../../admportal/config/admportal.json</argument>
- <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
- </arguments>
- </configuration>
- </execution>
-
- <execution>
- <id>Copy admportal config1</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>/bin/cp</executable>
- <arguments>
- <argument>../../admportal/config/admportal.log4js.json</argument>
- <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
- </arguments>
- </configuration>
- </execution>
-
-
- <execution>
- <id>change shell permissions</id>
- <phase>process-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>/usr/bin/find</executable>
- <arguments>
- <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
- <argument>-name</argument>
- <argument>*.sh</argument>
- <argument>-exec</argument>
- <argument>chmod</argument>
- <argument>+x</argument>
- <argument>{}</argument>
- <argument>;</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
- </plugins>
-
- </build>
- <organization>
- <name>openECOMP</name>
- </organization>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.openecomp.sdnc.oam</groupId>
+ <artifactId>installation</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+ <groupId>org.openecomp.sdnc.oam</groupId>
+ <artifactId>installation-admportal</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+
+ <name>Installation - admportal</name>
+ <description>Creates admportal Docker container</description>
+
+ <properties>
+ <image.name>openecomp/admportal-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] + "-SNAPSHOT-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}-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>
+ <execution>
+ <id>copy-properties</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals><!-- here the phase you need -->
+ <phase>validate</phase>
+ <configuration>
+ <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../src/main/properties</directory>
+ <includes>
+ <include>*.properties</include>
+ <include>*.properties.sdnctldb01</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>exec-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <version>1.5.0</version>
+ <executions>
+ <execution>
+ <id>Unzip admportal</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>/usr/bin/unzip</executable>
+ <arguments>
+ <argument>-d</argument>
+ <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+ <argument>../../admportal/target/*.zip</argument>
+ </arguments>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>Copy admportal config</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>/bin/cp</executable>
+ <arguments>
+ <argument>../../admportal/config/admportal.json</argument>
+ <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
+ </arguments>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>Copy admportal config1</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>/bin/cp</executable>
+ <arguments>
+ <argument>../../admportal/config/admportal.log4js.json</argument>
+ <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
+ </arguments>
+ </configuration>
+ </execution>
+
+
+ <execution>
+ <id>change shell permissions</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>/usr/bin/find</executable>
+ <arguments>
+ <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+ <argument>-name</argument>
+ <argument>*.sh</argument>
+ <argument>-exec</argument>
+ <argument>chmod</argument>
+ <argument>+x</argument>
+ <argument>{}</argument>
+ <argument>;</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ </plugins>
+
+ </build>
+ <organization>
+ <name>openECOMP</name>
+ </organization>
</project>
diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index f7a6375d..73963bc6 100644
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -19,6 +19,7 @@
<properties>
<image.name>openecomp/dgbuilder-sdnc-image</image.name>
+ <sdnc.project.version>${project.version}</sdnc.project.version>
</properties>
@@ -27,6 +28,42 @@
<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] + "-SNAPSHOT-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>
@@ -41,8 +78,8 @@
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
<tags>
- <tag>${project.version}</tag>
- <tag>latest</tag>
+ <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+ <tag>${project.docker.latesttag.version}</tag>
</tags>
</build>
</image>
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 6efa823c..93d22b64 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -19,6 +19,7 @@
<properties>
<image.name>openecomp/sdnc-image</image.name>
+ <sdnc.project.version>${project.version}</sdnc.project.version>
<sdnc.core.version>${project.version}</sdnc.core.version>
<sdnc.adaptors.version>${project.version}</sdnc.adaptors.version>
<sdnc.northbound.version>${project.version}</sdnc.northbound.version>
@@ -31,6 +32,42 @@
<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] + "-SNAPSHOT-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>
@@ -45,8 +82,8 @@
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
<tags>
- <tag>${project.version}</tag>
- <tag>latest</tag>
+ <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+ <tag>${project.docker.latesttag.version}</tag>
</tags>
</build>
</image>
@@ -72,6 +109,38 @@
</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>0.5.1-Boron-SR1</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>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
@@ -115,6 +184,7 @@
</resources>
</configuration>
</execution>
+
<execution>
<id>copy-tarballs</id>
<goals>
@@ -128,7 +198,6 @@
<directory>src/main/resources</directory>
<includes>
<include>*.tgz</include>
- <include>*.tar.gz</include>
<include>idmlight.db.mv.db</include>
</includes>
<filtering>false</filtering>
@@ -198,7 +267,7 @@
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <version>1.5.0</version>
+ <version>1.5.0</version>
<executions>
<execution>
diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml
index 5397b4ba..34b74b96 100644
--- a/installation/ubuntu/pom.xml
+++ b/installation/ubuntu/pom.xml
@@ -19,13 +19,49 @@
<properties>
<image.name>openecomp/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] + "-SNAPSHOT-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>
@@ -41,8 +77,9 @@
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
<tags>
- <tag>${project.version}</tag>
- <tag>latest</tag>
+ <tag>${project.version}</tag>
+ <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+ <tag>${project.docker.latesttag.version}</tag>
</tags>
</build>
</image>