Make images arm-64 compatible

Modify versions of docker maven plugin due to arm64 compatibility

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

diff --git a/cdt/pom.xml b/cdt/pom.xml
index bd408b5..6be529a 100644 (file)
--- a/cdt/pom.xml
+++ b/cdt/pom.xml
@@ -210,7 +210,7 @@ limitations under the License.
                     <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>
@@ -219,7 +219,7 @@ limitations under the License.
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                        <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                        <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${dockertag1}</tag>
                                             <tag>${dockertag2}</tag>

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index c1fa756..79f709f 100644 (file)
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -48,6 +48,7 @@ limitations under the License.
                <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
                <!--Determines the version of the cdt-proxy-service to download and install-->
                <appc.cdt.version>1.5.0-SNAPSHOT</appc.cdt.version>
+               <docker.plugin.version>0.28.0</docker.plugin.version>
        </properties>
 
 
@@ -261,7 +262,7 @@ limitations under the License.
                                        <plugin>
                                                <groupId>io.fabric8</groupId>
                                                <artifactId>docker-maven-plugin</artifactId>
-                                               <version>0.16.5</version>
+                                               <version>${docker.plugin.version}</version>
                                                <inherited>false</inherited>
                                                <configuration>
                                                        <images>
@@ -270,7 +271,7 @@ limitations under the License.
                                                                        <build>
                                                                                <cleanup>try</cleanup>
                                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                                                               <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                                                               <dockerFile>Dockerfile</dockerFile>
                                                                                <tags>
                                                                                        <tag>${dockertag1}</tag>
                                                                                        <tag>${dockertag2}</tag>