Effort to reduce image layer and size

[sdnc/oam.git] / installation / sdnc-web / pom.xml

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index 5da8976..135b62c 100644 (file)
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -8,9 +8,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-sdnc-web</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
@@ -23,8 +21,6 @@
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <docker.push.phase>deploy</docker.push.phase>
-        <docker.verbose>true</docker.verbose>
     </properties>
 
     <dependencies>
@@ -142,7 +138,7 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.16.5</version>
+                <version>0.34.0</version>
                 <inherited>false</inherited>
                 <configuration>
                     <images>
@@ -150,8 +146,9 @@
                             <name>${image.name}</name>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                <noCache>true</noCache>
+                                <contextDir>${basedir}/target/docker-stage</contextDir>
+                                <dockerFile>Dockerfile</dockerFile>
                                 <tags>
                                     <tag>${project.docker.latestminortag.version}</tag>
                                     <tag>${project.docker.latestfulltag.version}</tag>
@@ -160,18 +157,12 @@
                             </build>
                         </image>
                     </images>
+                    <verbose>${docker.verbose}</verbose>
+                    <skipPush>${docker.skip.push}</skipPush>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>generate-images</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>push-images</id>
-                        <phase>${docker.push.phase}</phase>
+                        <id>build-push-images</id>
                         <goals>
                             <goal>build</goal>
                             <goal>push</goal>