summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2019-04-19 16:38:19 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-19 16:38:19 +0000
commit65684e31a2c1770893d255a6a5f36652f1e9cbd9 (patch)
tree1c3354b148cf684305e3f8435b8a437397b2d0bc
parent3e04b724468731c53f9d3df599c91e7120dccd6c (diff)
parentda3e10e49c267f1af90ef70be741352859aeca2c (diff)
Merge "Build platform/cpu-agnostic SO container images on Arm platform"
-rw-r--r--packages/docker/pom.xml2
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image2
-rw-r--r--pom.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 88a5001f17..611e2d293d 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -64,7 +64,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.19.1</version>
+ <version>0.28.0</version>
<configuration>
<verbose>true</verbose>
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
index cf50868ca5..c0b298e778 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-alpine
+FROM docker.io/openjdk:8-jdk-alpine
ARG http_proxy
ARG https_proxy
diff --git a/pom.xml b/pom.xml
index 8b2d3ec445..aa8e987343 100644
--- a/pom.xml
+++ b/pom.xml
@@ -503,7 +503,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
- <version>3.5.33</version>
+ <version>4.0.0-M2</version>
<configuration>
<skip>${docker.skip}</skip>
<skipBuild>${docker.skip.build}</skipBuild>