Make images arm-64 compatible

Modify versions of docker maven plugin, so the images can be build on arm64

Change-Id: Ibc66feb2405359a564e87ff772ecebf2c05c7345
Issue-ID: INT-1005
Signed-off-by: Simon Hrabos <simon.hrabos@tieto.com>

diff --git a/alpine/pom.xml b/alpine/pom.xml
index 61d3b08..4e55ef0 100644 (file)
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -79,7 +79,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>

-                        <version>0.26.0</version>
+                        <version>0.28.0</version>

                         <inherited>false</inherited>
                         <configuration>
 
                         <inherited>false</inherited>
                         <configuration>
 

diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 4d49aea..08ad7fb 100644 (file)
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -128,7 +128,7 @@
                                        <plugin>
                                                <groupId>io.fabric8</groupId>
                                                <artifactId>docker-maven-plugin</artifactId>
                                        <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>
                                                <inherited>false</inherited>
                                                <configuration>
                                                        <images>


@@ -137,7 +137,7 @@
                                                                        <build>
                                                                                <cleanup>try</cleanup>
                                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                                                        <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>
                                                                                <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 124551e..1a36936 100644 (file)
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -170,7 +170,7 @@
                                        <plugin>
                                                <groupId>io.fabric8</groupId>
                                                <artifactId>docker-maven-plugin</artifactId>
                                        <plugin>
                                                <groupId>io.fabric8</groupId>
                                                <artifactId>docker-maven-plugin</artifactId>

-                                               <version>0.16.5</version>
+                                               <version>0.28.0</version>

                                                <inherited>false</inherited>
                                                <configuration>
 
                                                <inherited>false</inherited>
                                                <configuration>
 


@@ -180,7 +180,7 @@
                                                                        <build>
                                                                                <cleanup>try</cleanup>
                                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                                                        <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>
                                                                                <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 c1fd8db..6c238af 100644 (file)
--- 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
 # 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
 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 14af773..840920c 100644 (file)
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -506,7 +506,7 @@
                                        <plugin>
                                                <groupId>io.fabric8</groupId>
                                                <artifactId>docker-maven-plugin</artifactId>
                                        <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>
                                                <inherited>false</inherited>
                                                <configuration>
                                                        <images>


@@ -515,7 +515,7 @@
                                                                        <build>
                                                                                <cleanup>try</cleanup>
                                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                                                        <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>
                                                                                <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 ef33e37..1d0fd71 100644 (file)
--- 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>
                                        <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>
                                                <inherited>false</inherited>
                                                <configuration>
                                                        <images>


@@ -145,7 +145,7 @@
                                                                        <build>
                                                                                <cleanup>try</cleanup>
                                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                                                        <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>
                                                                                <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 13e0174..07ca5ee 100644 (file)
--- 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>
                                        <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>
                                                <inherited>false</inherited>
                                                <configuration>
                                                        <images>


@@ -146,7 +146,7 @@
                                                                        <build>
                                                                                <cleanup>try</cleanup>
                                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                                                        <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>
                                                                                <tags>
                                                                                        <tag>${project.docker.latestminortag.version}</tag>
                                                                                        <tag>${project.docker.latestfulltag.version}</tag>

diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index 2c18f25..bc6f903 100644 (file)
--- a/ubuntu/pom.xml
+++ b/ubuntu/pom.xml
@@ -80,7 +80,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>

-                        <version>0.26.0</version>
+                        <version>0.28.0</version>

                         <inherited>false</inherited>
                         <configuration>
 
                         <inherited>false</inherited>
                         <configuration>
 

diff --git a/ubuntu/src/main/docker/Dockerfile b/ubuntu/src/main/docker/Dockerfile
index 0066e76..e2eb9b5 100644 (file)
--- 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
 # 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
 MAINTAINER CCSDK  Team (onap-ccsdk@lists.onap.org)
 
 ARG HTTP_PROXY