From d25a6bcd8967ae6f7ee13f0ecc975355ca4dec2c Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Thu, 17 Jun 2021 16:06:17 -0400
Subject: [PATCH] Minor Refactoring of sliboot pom

Updating docker-maven-plugin to 0.34.0 and
removing docker image build goal (it was there twice)

Issue-ID: CCSDK-3343
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I26401befaf235ddfe694c6206cbd547cbc56cc03
(cherry picked from commit 108a13c20757f4a437aea22880f019e6e6043841)
---
 ms/sliboot/pom.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index afbc5c14..46e2c4f9 100644
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -39,16 +39,16 @@
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
         </dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
                 </exclusion>
             </exclusions>
-		</dependency>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
@@ -447,7 +447,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.28.0</version>
+                        <version>0.34.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -455,7 +455,8 @@
                                     <name>${image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                                        <noCache>true</noCache>
+                                        <contextDir>${basedir}/target/docker-stage</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.docker.latestminortag.version}</tag>
@@ -547,9 +548,7 @@
                             </execution>
                             <execution>
                                 <id>push-images</id>
-                                <phase>${docker.push.phase}</phase>
                                 <goals>
-                                    <goal>build</goal>
                                     <goal>push</goal>
                                 </goals>
                             </execution>
-- 
2.16.6