Removing multiarch support from docker repo
Issue-ID: POLICY-2598
Change-Id: I233e235ad22a4acda3d53060eae6cec454dec1a1
Signed-off-by: RossC <ross.carter@est.tech>
diff --git a/policy-jdk/alpine/pom.xml b/policy-jdk/alpine/pom.xml
index b890301..f866f80 100644
--- a/policy-jdk/alpine/pom.xml
+++ b/policy-jdk/alpine/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-alpine:latest-${project.docker.arch}</name>
+ <name>onap/policy-jdk-alpine</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>
-