aboutsummaryrefslogtreecommitdiffstats
path: root/ms/neng/pom.xml
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-02-14 13:52:48 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-02-14 15:07:48 -0500
commit00c3848ea8f8d2c03528838262c5c2168db2104a (patch)
tree437512a6f018cf64fcd0298b809d987cf9adb4bb /ms/neng/pom.xml
parent0928983b9875877e06eae506043f289e334f91a0 (diff)
Fix docker tags
Update docker tags to conform to ONAP project standards Change-Id: I348f9507e382931e6adfa224d30225f0fbe270bc Issue-ID: CCSDK-1059 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'ms/neng/pom.xml')
-rw-r--r--ms/neng/pom.xml26
1 files changed, 7 insertions, 19 deletions
diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index ed68afb4..fcd3f3d2 100644
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -59,7 +59,9 @@
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<image.name>onap/ccsdk-apps-ms-neng</image.name>
<timestamp>${maven.build.timestamp}</timestamp>
- <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
+ <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
+ <ccsdk.project.version>${project.version}</ccsdk.project.version>
+ <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
</properties>
<profiles>
@@ -198,9 +200,9 @@
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<tags>
- <tag>${project.version}</tag>
- <tag>${project.docker.latesttag.version}</tag>
- <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+ <tag>${project.docker.latestminortag.version}</tag>
+ <tag>${project.docker.latestfulltag.version}</tag>
+ <tag>${project.docker.latesttagtimestamp.version}</tag>
</tags>
</build>
</image>
@@ -381,21 +383,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}/../../TagVersion.groovy</source>
</configuration>
</execution>
</executions>