[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

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 1f5c420..16ac1c9 100644 (file)
--- 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>

diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index 73963bc..953e309 100644 (file)
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -41,19 +41,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:' +
@@ -78,6 +73,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>

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 93d22b6..d641031 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -45,19 +45,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:' +
@@ -82,6 +77,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>

diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml
index 34b74b9..9b597b3 100644 (file)
--- a/installation/ubuntu/pom.xml
+++ b/installation/ubuntu/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:' +