Make images arm-64 compatible 92/83592/2
authorSimon Hrabos <simon.hrabos@tieto.com>
Thu, 28 Mar 2019 10:22:04 +0000 (03:22 -0700)
committerSimon Hrabos <simon.hrabos@tieto.com>
Mon, 1 Apr 2019 06:44:03 +0000 (06:44 +0000)
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>
alpine/pom.xml
ansible-server/pom.xml
dgbuilder-docker/pom.xml
dgbuilder-docker/src/main/docker/Dockerfile
odlsli/odlsli-alpine/pom.xml
opendaylight/fluorine/fluorine-alpine/pom.xml
opendaylight/fluorine/fluorine-ubuntu/pom.xml
ubuntu/pom.xml
ubuntu/src/main/docker/Dockerfile

index 61d3b08..4e55ef0 100644 (file)
@@ -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>
 
index 4d49aea..08ad7fb 100644 (file)
                                        <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>
                                                                        <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>
index 124551e..1a36936 100644 (file)
                                        <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>
 
                                                                        <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>
index c1fd8db..6c238af 100644 (file)
@@ -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
index 14af773..840920c 100644 (file)
                                        <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>
                                                                        <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>
index ef33e37..1d0fd71 100644 (file)
                                        <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>
                                                                        <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>
index 13e0174..07ca5ee 100644 (file)
                                        <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>
                                                                        <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>
index 2c18f25..bc6f903 100644 (file)
@@ -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>
 
index 0066e76..e2eb9b5 100644 (file)
@@ -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

© 2017 ONAP. Copyright © The Linux Foundation ®. All Rights Reserved.
The Linux Foundation has registered trademarks and uses trademarks.
For a list of trademarks of The Linux Foundation, please see our Trademark Usage page.
Linux is a registered trademark of Linus Torvalds.
Privacy Policy and Terms of Use