From b0012ae3e1bb0187eee1bb3fe53b37934ba6d844 Mon Sep 17 00:00:00 2001
From: sg481n <sg481n@att.com>
Date: Sun, 24 Sep 2017 05:39:19 +0000
Subject: Release docker image of AAF to nexus

Modified authz-service pom file with docker spotify plugin.

Issue-id: AAF-59
Change-Id: Idd236cca50d3f977cd2f52b1303700f7406df308
Signed-off-by: sg481n <sg481n@att.com>
---
 authz-service/pom.xml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'authz-service')

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index fab37c4f..c0089922 100644
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -56,7 +56,7 @@
 		<project.swmVersion>1</project.swmVersion>
 			<project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
 		<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
-	    <dockerLocation>${basedir}/target/</dockerLocation>
+        <dockerLocation>${basedir}/target/</dockerLocation>
 		<distFilesRootDirPath>opt/app/aaf/${project.artifactId}/${project.version}</distFilesRootDirPath>
 			<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -70,8 +70,6 @@
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
 		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
-		
-        <docker.push.registry>localhost:5000</docker.push.registry>
         <skip.docker.build>true</skip.docker.build>
         <skip.docker.push>true</skip.docker.push>
         <skip.staging.artifacts>false</skip.staging.artifacts>
@@ -157,7 +155,7 @@
         <version>1.0.0</version>
         <configuration>
           <imageName>onap/aaf/authz-service</imageName>
-          <dockerDirectory>${dockerLocation}</dockerDirectory>
+         <dockerDirectory>src/main/resources/docker</dockerDirectory>
           <serverId>docker-hub</serverId>
           <imageTags>
             <imageTag>latest</imageTag>
@@ -168,14 +166,15 @@
 		  <resources>
             <resource>
 			    <targetPath>/</targetPath>
-                    <directory>/${basedir}/target/opt</directory>
+                    <directory>${project.build.directory}/opt</directory>
                     <filtering>true</filtering>
                      <includes>
                         <include>**/*</include>
                             </includes>
             </resource>
          </resources>  
-        </configuration>
+		 
+		 </configuration>
         <executions>
           <execution>
             <id>build-image</id>
@@ -196,7 +195,7 @@
             </goals>
             <configuration>
               <image>onap/aaf/authz-service</image>
-              <newName>${docker.push.registry}/onap/aaf/authz-service:${project.docker.latesttagtimestamp.version}</newName>
+              <newName>onap/aaf/authz-service:${project.docker.latesttagtimestamp.version}</newName>
               <skipDockerTag>${skip.docker.push}</skipDockerTag>
             </configuration>
           </execution>
@@ -207,7 +206,7 @@
               <goal>push</goal>
             </goals>
             <configuration>
-              <imageName>${docker.push.registry}/onap/aaf/authz-service:${project.docker.latesttagtimestamp.version}</imageName>
+              <imageName>onap/aaf/authz-service:${project.docker.latesttagtimestamp.version}</imageName>
               <skipDockerPush>${skip.docker.push}</skipDockerPush>
             </configuration>
           </execution>
@@ -219,7 +218,7 @@
             </goals>
             <configuration>
               <image>onap/aaf/authz-service</image>
-              <newName>${docker.push.registry}/onap/aaf/authz-service:${project.docker.latesttag.version}</newName>
+              <newName>onap/aaf/authz-service:${project.docker.latesttag.version}</newName>
               <skipDockerTag>${skip.docker.push}</skipDockerTag>
             </configuration>
           </execution>
@@ -230,7 +229,7 @@
               <goal>push</goal>
             </goals>
             <configuration>
-              <imageName>${docker.push.registry}/onap/aaf/authz-service:${project.docker.latesttag.version}</imageName>
+              <imageName>onap/aaf/authz-service:${project.docker.latesttag.version}</imageName>
               <skipDockerPush>${skip.docker.push}</skipDockerPush>
             </configuration>
           </execution>
@@ -242,7 +241,7 @@
             </goals>
             <configuration>
               <image>onap/aaf/authz-service</image>
-              <newName>${docker.push.registry}/onap/aaf/authz-service:latest</newName>
+              <newName>onap/aaf/authz-service:latest</newName>
               <skipDockerTag>${skip.docker.push}</skipDockerTag>
             </configuration>
           </execution>
@@ -253,18 +252,18 @@
               <goal>push</goal>
             </goals>
             <configuration>
-              <imageName>${docker.push.registry}/onap/aaf/authz-service:latest</imageName>
+              <imageName>onap/aaf/authz-service:latest</imageName>
               <skipDockerPush>${skip.docker.push}</skipDockerPush>
             </configuration>
           </execution>
         </executions>
       </plugin>
 
-			<plugin>
+ <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.7</version>
               <executions>
-	              <execution>
+	            <execution>
                         <id>copy-docker-file</id>
                         <phase>package</phase>
                         <goals>
@@ -283,7 +282,7 @@
                                 </resource>
                             </resources>
                         </configuration>
-                    </execution>
+                    </execution>  
       <execution>
         <id>copy-resources-1</id>
         <phase>validate</phase>
-- 
cgit 1.2.3-korg