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>

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