Effort to reduce image layer and size
Removing few ENV version variable and those should be read
from pom properties (maven-resource-plugin filtering true)
Combined Dockerfile and Standalone.Dockerfile
Adding Docker build arg AAF which will decide whether to add
aaa-app-config.xml in docker image or not for standalone
Updated docker-maven-plugin to 0.34.0 to have noCache true
Removing start-it-container execution as it's being tested by CSIT
Replacing maven-exec-plugin with maven-antrun-plugin
Updating latest base docker images versions
Updating parent version to 2.1.7
Issue-ID: CCSDK-3226
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I68f8f4780804a2014b73b5eeb9dba29d1896a602
Former-commit-id: 866ddebbcac80c38c79c46bb37373123a0c678f0
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index b4f9d0d..bb11792 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -8,9 +8,7 @@
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-ansible-server</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
@@ -33,6 +31,7 @@
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
@@ -64,7 +63,7 @@
<includes>
<include>**/*</include>
</includes>
- <filtering>false</filtering>
+ <filtering>true</filtering>
</resource>
</resources>
</configuration>
@@ -82,7 +81,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>
@@ -90,7 +89,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>
@@ -100,19 +100,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>deploy</phase>
+ <id>build-push-images</id>
<goals>
<goal>build</goal>
<goal>push</goal>