From fcec4180525b4b97d4739c7fa7915f7be0a9709b Mon Sep 17 00:00:00 2001
From: Srinivasan Selvam <srinivasan.s.n@huawei.com>
Date: Fri, 28 Feb 2020 08:02:57 +0530
Subject: Add docker manifest file to build onap/policy-pap pom.xml modified
 with repository from nexus to  docker.io

Issue-ID: POLICY-1997
Signed-off-by: Srinivasan Selvam <srinivasan.s.n@huawei.com>
Change-Id: I616269d9278b92f8275128c39a8f51ebe955354b
---
 packages/policy-pap-docker/pom.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'packages')

diff --git a/packages/policy-pap-docker/pom.xml b/packages/policy-pap-docker/pom.xml
index 0615cf2b..2b5cd2ab 100644
--- a/packages/policy-pap-docker/pom.xml
+++ b/packages/policy-pap-docker/pom.xml
@@ -41,8 +41,8 @@
         <docker.skip>false</docker.skip>
         <docker.skip.build>false</docker.skip.build>
         <docker.skip.push>false</docker.skip.push>
-        <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
-        <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+        <docker.pull.registry>docker.io</docker.pull.registry>
+        <docker.push.registry>docker.io</docker.push.registry>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
     </properties>
 
@@ -55,7 +55,7 @@
                 <version>1.0</version>
                 <executions>
                     <execution>
-                        <phase>validate</phase>
+                        <phase>pre-clean</phase>
                         <goals>
                             <goal>execute</goal>
                         </goals>
@@ -74,6 +74,12 @@
                                     }
                                     println 'New tag for docker: ' + project.properties['project.docker.latest.minmax.tag.version']
                                 }
+                                if ( "aarch64".equals(System.properties['os.arch']) ) {
+                                    project.properties['project.docker.arch'] = "arm64";
+                                } else {
+                                    project.properties['project.docker.arch'] = System.properties['os.arch'];
+                                }
+                                println 'Using arch for docker: ' + project.properties['project.docker.arch'];
                             </source>
                         </configuration>
                     </execution>
@@ -92,14 +98,14 @@
 
                     <images>
                         <image>
-                            <name>onap/policy-pap</name>
+                            <name>onap/policy-pap:latest-${project.docker.arch}</name>
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFile>Dockerfile</dockerFile>
                                 <tags>
                                     <tag>${project.version}</tag>
-                                    <tag>${project.version}-${maven.build.timestamp}</tag>
-                                    <tag>${project.docker.latest.minmax.tag.version}</tag>
+                                    <tag>${project.version}-${project.docker.arch}</tag>
+                                    <tag>${project.docker.latest.minmax.tag.version}-${project.docker.arch}</tag>
                                 </tags>
                                 <assembly>
                                     <inline>
-- 
cgit 1.2.3-korg