Release docker image of AAF to ONAP Nexus

Issue-id: AAF-59
Change-Id: I630b299d6d0c3fe828d3a130937ee473e6c00774
Signed-off-by: sg481n <sg481n@att.com>

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index bb26872..507f2b4 100644 (file)
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -66,6 +66,7 @@
                <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
                <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
         <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+               <docker.push.registry>localhost:5000</docker.push.registry>\r
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
@@ -146,6 +147,7 @@
 \r
 \r
        <build>\r
+       <finalName>authz-service</finalName>\r
            <plugins>\r
        \r
                \r
@@ -206,7 +208,7 @@
             </goals>\r
             <configuration>\r
               <image>onap/aaf/authz-service</image>\r
-              <newName>onap/aaf/authz-service:${project.version}</newName>\r
+              <newName>${docker.push.registry}/onap/aaf/authz-service:${project.version}</newName>\r
               <skipDockerTag>${skip.docker.push}</skipDockerTag>\r
             </configuration>\r
           </execution>\r
@@ -219,7 +221,7 @@
             </goals>\r
             <configuration>\r
               <image>onap/aaf/authz-service</image>\r
-              <newName>onap/aaf/authz-service:latest</newName>\r
+              <newName>${docker.push.registry}/onap/aaf/authz-service:latest</newName>\r
               <skipDockerTag>${skip.docker.push}</skipDockerTag>\r
             </configuration>\r
           </execution>\r
@@ -231,7 +233,7 @@
               <goal>push</goal>\r
             </goals>\r
             <configuration>\r
-              <imageName>onap/aaf/authz-service:${project.version}</imageName>\r
+              <imageName>${docker.push.registry}/onap/aaf/authz-service:${project.version}</imageName>\r
               <skipDockerPush>${skip.docker.push}</skipDockerPush>\r
             </configuration>\r
           </execution>\r
@@ -243,7 +245,7 @@
               <goal>push</goal>\r
             </goals>\r
             <configuration>\r
-              <imageName>onap/aaf/authz-service:latest</imageName>\r
+              <imageName>${docker.push.registry}/onap/aaf/authz-service:latest</imageName>\r
               <skipDockerPush>${skip.docker.push}</skipDockerPush>\r
             </configuration>\r
           </execution>\r

diff --git a/authz-service/src/main/resources/docker/Dockerfile b/authz-service/src/main/resources/docker/Dockerfile
index ae670f7..9b229cd 100644 (file)
--- a/authz-service/src/main/resources/docker/Dockerfile
+++ b/authz-service/src/main/resources/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8-jdk \r
 ADD opt /opt/\r
-ADD authz-service-1.0.1-SNAPSHOT.jar /opt/app/aaf/authz-service/lib/authz-service-1.0.1-SNAPSHOT.jar\r
+ADD authz-service.jar /opt/app/aaf/authz-service/lib/authz-service.jar\r
 ADD startup.sh /startup.sh\r
 RUN chmod 777 /startup.sh\r
 RUN chmod -R 777 /opt/app/aaf/authz-service/etc\r