summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-04-01 15:59:38 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-01 15:59:38 +0000
commit1f8c95ab7ae772e2f6945f05ac19006ffb892e22 (patch)
treeea0cc4ad97fcff98af094ed73e3f4d7cc425dfa6
parent4b054f9fab21f76992441e92069694d9f0cba0aa (diff)
parent468051046599745b03f523c8696c41e65aad4ea9 (diff)
Merge "Make images arm-64 compatible"
-rw-r--r--alpine/pom.xml2
-rw-r--r--ansible-server/pom.xml4
-rw-r--r--dgbuilder-docker/pom.xml4
-rw-r--r--dgbuilder-docker/src/main/docker/Dockerfile2
-rw-r--r--odlsli/odlsli-alpine/pom.xml4
-rw-r--r--opendaylight/fluorine/fluorine-alpine/pom.xml4
-rw-r--r--opendaylight/fluorine/fluorine-ubuntu/pom.xml4
-rw-r--r--ubuntu/pom.xml2
-rw-r--r--ubuntu/src/main/docker/Dockerfile2
9 files changed, 14 insertions, 14 deletions
diff --git a/alpine/pom.xml b/alpine/pom.xml
index 61d3b08e..4e55ef07 100644
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -79,7 +79,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.26.0</version>
+ <version>0.28.0</version>
<inherited>false</inherited>
<configuration>
diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 4d49aeaf..08ad7fb3 100644
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -128,7 +128,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>0.28.0</version>
<inherited>false</inherited>
<configuration>
<images>
@@ -137,7 +137,7 @@
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index 124551ee..1a369363 100644
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -170,7 +170,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>0.28.0</version>
<inherited>false</inherited>
<configuration>
@@ -180,7 +180,7 @@
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile
index c1fd8dbd..6c238af1 100644
--- a/dgbuilder-docker/src/main/docker/Dockerfile
+++ b/dgbuilder-docker/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
# Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ubuntu-image:${project.docker.latestfulltag.version}
+FROM onap/ccsdk-alpine-image:${project.docker.latestfulltag.version}
MAINTAINER CCSDK Team (onap-discuss@lists.onap.org)
# Create non-root user
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 8d4fbd6b..3700cfa5 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -520,7 +520,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>0.28.0</version>
<inherited>false</inherited>
<configuration>
<images>
@@ -529,7 +529,7 @@
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
diff --git a/opendaylight/fluorine/fluorine-alpine/pom.xml b/opendaylight/fluorine/fluorine-alpine/pom.xml
index ef33e374..1d0fd71c 100644
--- a/opendaylight/fluorine/fluorine-alpine/pom.xml
+++ b/opendaylight/fluorine/fluorine-alpine/pom.xml
@@ -136,7 +136,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>0.28.0</version>
<inherited>false</inherited>
<configuration>
<images>
@@ -145,7 +145,7 @@
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
diff --git a/opendaylight/fluorine/fluorine-ubuntu/pom.xml b/opendaylight/fluorine/fluorine-ubuntu/pom.xml
index 13e01743..07ca5eed 100644
--- a/opendaylight/fluorine/fluorine-ubuntu/pom.xml
+++ b/opendaylight/fluorine/fluorine-ubuntu/pom.xml
@@ -137,7 +137,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>0.28.0</version>
<inherited>false</inherited>
<configuration>
<images>
@@ -146,7 +146,7 @@
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index 2c18f251..bc6f903f 100644
--- a/ubuntu/pom.xml
+++ b/ubuntu/pom.xml
@@ -80,7 +80,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.26.0</version>
+ <version>0.28.0</version>
<inherited>false</inherited>
<configuration>
diff --git a/ubuntu/src/main/docker/Dockerfile b/ubuntu/src/main/docker/Dockerfile
index 0066e761..e2eb9b5a 100644
--- a/ubuntu/src/main/docker/Dockerfile
+++ b/ubuntu/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
# Base ubuntu with added packages needed for open ecomp
-FROM ubuntu:16.04
+FROM docker.io/ubuntu:16.04
MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
ARG HTTP_PROXY