summaryrefslogtreecommitdiffstats
path: root/packages/policy-pap-docker
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-03-06 00:04:41 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-06 00:04:41 +0000
commit2d280012e46f007c0ff9686737d98de6561e669e (patch)
treee4465332ec1a26843135bea8c0296cdb82858b4a /packages/policy-pap-docker
parent887eeabc129c895bebf7f776ccb86b2402c9be0d (diff)
parentfcec4180525b4b97d4739c7fa7915f7be0a9709b (diff)
Merge "Add docker manifest file to build onap/policy-pap pom.xml modified with repository from nexus to docker.io"
Diffstat (limited to 'packages/policy-pap-docker')
-rw-r--r--packages/policy-pap-docker/pom.xml18
1 files changed, 12 insertions, 6 deletions
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>