diff options
Diffstat (limited to 'policy-common')
| -rw-r--r-- | policy-common/alpine/pom.xml | 17 | ||||
| -rw-r--r-- | policy-common/alpine/src/main/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | policy-common/pom.xml | 7 |
3 files changed, 16 insertions, 12 deletions
diff --git a/policy-common/alpine/pom.xml b/policy-common/alpine/pom.xml index bc4211b7..b36221c4 100644 --- a/policy-common/alpine/pom.xml +++ b/policy-common/alpine/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.docker</groupId> <artifactId>policy-common</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> @@ -43,7 +43,7 @@ <version>1.0</version> <executions> <execution> - <phase>validate</phase> + <phase>pre-clean</phase> <goals> <goal>execute</goal> </goals> @@ -62,6 +62,12 @@ } 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> @@ -79,14 +85,13 @@ <pushRegistry>${docker.push.registry}</pushRegistry> <images> <image> - <name>onap/policy-common-alpine</name> + <name>onap/policy-common-alpine: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.latesttag.version}</tag> + <tag>${project.version}-${project.docker.arch}</tag> + <tag>${project.docker.latesttag.version}-${project.docker.arch}</tag> </tags> <args> <BUILD_VERSION>${docker.build.version}</BUILD_VERSION> diff --git a/policy-common/alpine/src/main/docker/Dockerfile b/policy-common/alpine/src/main/docker/Dockerfile index 96f4df53..ba8d2d17 100644 --- a/policy-common/alpine/src/main/docker/Dockerfile +++ b/policy-common/alpine/src/main/docker/Dockerfile @@ -17,9 +17,9 @@ # ============LICENSE_END========================================================= # -# Docker file to build an image that contains commom packages for Policy components +# Docker file to build an image that contains common packages for Policy components # -FROM onap/policy-base-alpine +FROM onap/policy-base-alpine:latest-${project.docker.arch} LABEL maintainer="Policy Team" diff --git a/policy-common/pom.xml b/policy-common/pom.xml index 433fd00f..d63bf4e5 100644 --- a/policy-common/pom.xml +++ b/policy-common/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.docker</groupId> <artifactId>docker</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>policy-common</artifactId> @@ -37,9 +37,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> - <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> + <docker.pull.registry>docker.io</docker.pull.registry> + <docker.push.registry>docker.io</docker.push.registry> <docker.build.version>${project.version}</docker.build.version> </properties> |