From 55378e7480442b8cee46d215a85e194c56b38f36 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Mon, 7 Jun 2021 20:02:32 +0000
Subject: 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
---
 pom.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 2f6b0451..f29d53c6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -22,16 +22,18 @@
     </organization>
 
     <properties>
+        <sdnc.project.version>${project.version}</sdnc.project.version>
+
         <!-- Artifacts -->
         <ccsdk.distribution.version>1.2.0-SNAPSHOT</ccsdk.distribution.version> <!-- Used by platform-logic/setup -->
         <ccsdk.features.version>${ccsdk.distribution.version}</ccsdk.features.version> <!-- Used by installation/sdnc-web -->
         <sdnc.northbound.version>2.2.0-SNAPSHOT</sdnc.northbound.version> <!-- Used by installation/sdnc -->
 
         <!-- docker images -->
-        <ccsdk.docker.alpine.j11.version>1.1.1</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
+        <ccsdk.docker.alpine.j11.version>1.2-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
         <ccsdk.docker.odlsli.alpine.version>1.2-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
-        <ccsdk.docker.ansible.server.version>1.0-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
-        <ccsdk.docker.ubuntu.version>0.7-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
+        <ccsdk.docker.ansible.server.version>1.2-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
+        <ccsdk.docker.ubuntu.version>1.2-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
     </properties>
 
     <modules>
@@ -111,10 +113,7 @@
                         </executions>
                     </plugin>
                 </plugins>
-
-
             </build>
-
         </profile>
         <profile>
             <id>docker</id>
@@ -122,6 +121,5 @@
                 <module>installation</module>
             </modules>
         </profile>
-
     </profiles>
 </project>
-- 
cgit 1.2.3-korg