From 4bc1e2baee59e60f832065743c4869de4fdaa6c0 Mon Sep 17 00:00:00 2001
From: "david.mcweeney" <david.mcweeney@est.tech>
Date: Fri, 23 Apr 2021 13:11:28 +0100
Subject: [PATCH] Fix Tags

Signed-off-by: david.mcweeney <david.mcweeney@est.tech>
Change-Id: I951bce3a10ce14b28f5f2f42f7ac1a645c5dd66a
Issue-ID: DMAAP-1544
---
 dbc-client/pom.xml | 13 +++++++------
 dmaap-bc/pom.xml   | 13 +++++++------
 pom.xml            |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml
index 6de1007..fdda1a5 100644
--- a/dbc-client/pom.xml
+++ b/dbc-client/pom.xml
@@ -118,25 +118,26 @@
       <id>docker</id>
       <properties>
         <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
-        <skipDockerTag>${skip.docker.tag}</skipDockerTag>
         <skipTests>true</skipTests>
       </properties>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.codehaus.gmaven</groupId>
+            <artifactId>gmaven-plugin</artifactId>
+          </plugin>
           <plugin>
             <groupId>io.fabric8</groupId>
             <artifactId>docker-maven-plugin</artifactId>
             <configuration>
-              <verbose>${docker.verbose}</verbose>
-              <apiVersion>${docker.apiVersion}</apiVersion>
-              <pullRegistry>${docker.pull.registry}</pullRegistry>
-              <pushRegistry>${docker.push.registry}</pushRegistry>
               <images>
                 <image>
                   <name>${dmaapbcclient.image.name}</name>
                   <build>
                     <cleanup>try</cleanup>
-                    <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                    <noCache>true</noCache>
+                    <optimise>true</optimise>
+                    <contextDir>${basedir}/target/docker-stage</contextDir>
                     <dockerFile>Dockerfile</dockerFile>
                     <tags>
                       <tag>${dockertag1}</tag>
diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml
index bd0eda0..1eeca2a 100644
--- a/dmaap-bc/pom.xml
+++ b/dmaap-bc/pom.xml
@@ -420,25 +420,26 @@
       <id>docker</id>
       <properties>
         <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
-        <skipDockerTag>${skip.docker.tag}</skipDockerTag>
         <skipTests>false</skipTests>
       </properties>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.codehaus.gmaven</groupId>
+            <artifactId>gmaven-plugin</artifactId>
+          </plugin>
           <plugin>
             <groupId>io.fabric8</groupId>
             <artifactId>docker-maven-plugin</artifactId>
             <configuration>
-              <verbose>${docker.verbose}</verbose>
-              <apiVersion>${docker.apiVersion}</apiVersion>
-              <pullRegistry>${docker.pull.registry}</pullRegistry>
-              <pushRegistry>${docker.push.registry}</pushRegistry>
               <images>
                 <image>
                   <name>${dmaapbc.image.name}</name>
                   <build>
                     <cleanup>try</cleanup>
-                    <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                    <noCache>true</noCache>
+                    <optimise>true</optimise>
+                    <contextDir>${basedir}/target/docker-stage</contextDir>
                     <dockerFile>Dockerfile</dockerFile>
                     <tags>
                       <tag>${dockertag1}</tag>
diff --git a/pom.xml b/pom.xml
index 44f0948..5c421b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
     <skip.docker.push>false</skip.docker.push>
     <docker.verbose>true</docker.verbose>
     <docker.apiVersion>2.2.54</docker.apiVersion>
-    <io.fabric8.version>0.28.0</io.fabric8.version>
+    <io.fabric8.version>0.33.0</io.fabric8.version>
     <gmaven-plugin.version>1.5</gmaven-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-- 
2.16.6