summaryrefslogtreecommitdiffstats
path: root/saltstack-server/pom.xml
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-02-12 14:35:10 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-02-12 14:35:10 -0500
commit268c4ba118679fa90b973ac49660d8f83eb9575b (patch)
treea7a5d10e9cb9b5131508355965d7fc5ff3ccccea /saltstack-server/pom.xml
parent8ba2cee45f88c64d096dbbb29e73741403f747d1 (diff)
Fix docker tags
Updated docker tags to conform to ONAP standards Change-Id: If461ee7ea99a1966e66a03a3a970d0acef835320 Issue-ID: CCSDK-1059 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'saltstack-server/pom.xml')
-rw-r--r--saltstack-server/pom.xml25
1 files changed, 5 insertions, 20 deletions
diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index 019fcef7..b6d27010 100644
--- a/saltstack-server/pom.xml
+++ b/saltstack-server/pom.xml
@@ -18,6 +18,7 @@
<properties>
<image.name>onap/ccsdk-saltstack-server-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
+ <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
</properties>
<build>
@@ -33,23 +34,7 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- println project.properties['ccsdk.project.version'];
- def versionArray;
- if ( project.properties['ccsdk.project.version'] != null ) {
- versionArray = project.properties['ccsdk.project.version'].split('\\.');
- }
-
- if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
- {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
- } else {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
- }
-
- println 'New Tag for docker:' +
- project.properties['project.docker.latesttag.version'];
- </source>
+ <source>${basedir}/../src/main/scripts/TagVersion.groovy</source>
</configuration>
</execution>
</executions>
@@ -103,9 +88,9 @@
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<dockerFile>Dockerfile</dockerFile>
<tags>
- <tag>${project.version}</tag>
- <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
- <tag>${project.docker.latesttag.version}</tag>
+ <tag>${project.docker.latestminortag.version}</tag>
+ <tag>${project.docker.latestfulltag.version}</tag>
+ <tag>${project.docker.latesttagtimestamp.version}</tag>
</tags>
</build>
</image>