diff options
| author |   RossC <ross.carter@est.tech> | 2020-06-16 11:41:49 +0100 |
|---|---|---|
| committer | RossC <ross.carter@est.tech> | 2020-06-18 11:13:44 +0100 |
| commit | 3d168b00f159c33cc0afbe7837f9456ae43fbc6f (patch) | |
| tree | c2f8f74f8b6e2a013bfd415245ea42c8f3300270 /policy-jre | |
| parent | d8debabbb3b585cd152a3bf8baac17d1944e3e6b (diff) | |
Removing multiarch support from docker repo
Issue-ID: POLICY-2598
Change-Id: I233e235ad22a4acda3d53060eae6cec454dec1a1
Signed-off-by: RossC <ross.carter@est.tech>
Diffstat (limited to 'policy-jre')
| -rw-r--r-- | policy-jre/alpine/pom.xml | 16 | ||||
| -rw-r--r-- | policy-jre/debian-slim/pom.xml | 15 |
2 files changed, 10 insertions, 21 deletions
diff --git a/policy-jre/alpine/pom.xml b/policy-jre/alpine/pom.xml index f042c42d..e7ad5366 100644 --- a/policy-jre/alpine/pom.xml +++ b/policy-jre/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-jre-alpine:latest-${project.docker.arch}</name> + <name>onap/policy-jre-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> - diff --git a/policy-jre/debian-slim/pom.xml b/policy-jre/debian-slim/pom.xml index ad2d85ca..639516b5 100644 --- a/policy-jre/debian-slim/pom.xml +++ b/policy-jre/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 @@ <images> <image> - <name>onap/policy-jre-debian:latest-${project.docker.arch}</name> + <name>onap/policy-jre-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> |