From 9f6f0bc0e70a5b13b0e9db9e0d0e0ec85e1214ca Mon Sep 17 00:00:00 2001
From: Michael Hwang <mhwang@research.att.com>
Date: Mon, 18 Sep 2017 17:09:35 -0400
Subject: Remove the mapping of docker executions

The corresponding jjb has been changed to explicitly call the docker
execution operations.

Change-Id: I186b104c8ee65837f20978a5aefdd467bc624d31
Issue-Id: DCAEGEN2-60
Signed-off-by: Michael Hwang <mhwang@research.att.com>
---
 pom.xml | 40 +++++-----------------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/pom.xml b/pom.xml
index b760888..95ad30d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,8 +270,7 @@
                 <artifactId>docker-maven-plugin</artifactId>
                 <version>0.4.11</version>
                 <configuration>
-                    <!-- LOOK! Need to fill in registry here -->
-                    <imageName>${project.artifactId}</imageName>
+                    <imageName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId}</imageName>
                     <baseImage>openjdk:8-jre</baseImage>
                     <entryPoint>["java", "-jar", "/opt/${project.build.finalName}.jar", "server"]</entryPoint>
                     <resources>
@@ -284,40 +283,11 @@
                     <exposes>
                         <expose>8080</expose>
                     </exposes>
+                    <imageTags>
+                        <imageTag>${project.version}-${maven.build.timestamp}</imageTag>
+                        <imageTag>latest</imageTag>
+                    </imageTags>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>tag-image-timestamped-version</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>tag</goal>
-                        </goals>
-                        <configuration>
-                            <image>${project.artifactId}</image>
-                            <newName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId}:${project.version}-${maven.build.timestamp}</newName>
-                            <pushImage>true</pushImage>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>tag-image-latest-version</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>tag</goal>
-                        </goals>
-                        <configuration>
-                            <image>${project.artifactId}</image>
-                            <newName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId}:LATEST</newName>
-                            <pushImage>true</pushImage>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
 
             <plugin>
-- 
cgit 1.2.3-korg