aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-04-25 08:43:30 -0400
committerDan Timoney <dtimoney@att.com>2017-04-25 09:04:41 -0400
commit687146e4c55b019970e4e642d572ebb3285486ca (patch)
treeddc5415424d9a9d1190c9c5d18bf54dfb7937013
parent8f77351687ce1bb10420c97ce40dd9fb73e6bd06 (diff)
[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
-rw-r--r--installation/admportal/pom.xml16
-rw-r--r--installation/dgbuilder/pom.xml16
-rw-r--r--installation/sdnc/pom.xml16
-rw-r--r--installation/ubuntu/pom.xml15
4 files changed, 23 insertions, 40 deletions
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>
diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index 73963bc6..953e309e 100644
--- 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 93d22b64..d6410314 100644
--- 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 34b74b96..9b597b3f 100644
--- 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:' +