From 687146e4c55b019970e4e642d572ebb3285486ca Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 25 Apr 2017 08:43:30 -0400
Subject: [DOCKER] Fix docker config

Fix docker config error in pom.xml

Change-Id: I806c4e3f383da2be01d9ea6743807929c5378a15
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: d4698382607eb0df3e87a0a1ee29937c8d85fe39
---
 installation/admportal/pom.xml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'installation/admportal')

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 1f5c4201..16ac1c9e 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -40,19 +40,14 @@
 								println project.properties['sdnc.project.version'];
 								def versionArray;
 								if ( project.properties['sdnc.project.version'] != null ) {
-								versionArray =
-								project.properties['sdnc.project.version'].split('\\.');
+									versionArray =
+									project.properties['sdnc.project.version'].split('\\.');
 								}
 
-								if (
-								project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")
-								)
-								{
-								project.properties['project.docker.latesttag.version']=versionArray[0]
-								+ '.' + versionArray[1] + "-SNAPSHOT-latest";
+								if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
+									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
 								} else {
-								project.properties['project.docker.latesttag.version']=versionArray[0]
-								+ '.' + versionArray[1] + "-STAGING-latest";
+									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 								}
 
 								println 'New Tag for docker:' +
@@ -77,6 +72,7 @@
 								<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
 								<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
 								<tags>
+									<tag>${project.version}</tag>
 									<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
 									<tag>${project.docker.latesttag.version}</tag>
 								</tags>
-- 
cgit 1.2.3-korg