From 3d168b00f159c33cc0afbe7837f9456ae43fbc6f Mon Sep 17 00:00:00 2001
From: RossC <ross.carter@est.tech>
Date: Tue, 16 Jun 2020 11:41:49 +0100
Subject: Removing multiarch support from docker repo

Issue-ID: POLICY-2598
Change-Id: I233e235ad22a4acda3d53060eae6cec454dec1a1
Signed-off-by: RossC <ross.carter@est.tech>
---
 policy-jdk/debian-slim/pom.xml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'policy-jdk/debian-slim')

diff --git a/policy-jdk/debian-slim/pom.xml b/policy-jdk/debian-slim/pom.xml
index 7b49e215..8d51a610 100644
--- a/policy-jdk/debian-slim/pom.xml
+++ b/policy-jdk/debian-slim/pom.xml
@@ -44,7 +44,7 @@
                 <version>1.0</version>
                 <executions>
                     <execution>
-                        <phase>pre-clean</phase>
+                        <phase>validate</phase>
                         <goals>
                             <goal>execute</goal>
                         </goals>
@@ -63,12 +63,6 @@
                                 }
 
                                 println 'New tag for docker: ' + project.properties['project.docker.latesttag.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>
@@ -85,13 +79,14 @@
                     <pushRegistry>${docker.push.registry}</pushRegistry>
                     <images>
                         <image>
-                            <name>onap/policy-jdk-debian:latest-${project.docker.arch}</name>
+                            <name>onap/policy-jdk-debian</name>
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFile>Dockerfile</dockerFile>
                                 <tags>
-                                    <tag>${project.version}-${project.docker.arch}</tag>
-                                    <tag>${project.docker.latesttag.version}-${project.docker.arch}</tag>
+                                    <tag>${project.version}</tag>
+                                    <tag>${project.version}-${maven.build.timestamp}</tag>
+                                    <tag>${project.docker.latesttag.version}</tag>
                                 </tags>
                             </build>
                         </image>
@@ -148,4 +143,3 @@
         </plugins>
     </build>
 </project>
-
-- 
cgit 1.2.3-korg