diff options
| author |   pdragosh <pdragosh@research.att.com> | 2019-06-26 13:54:26 -0400 |
|---|---|---|
| committer | pdragosh <pdragosh@research.att.com> | 2019-06-26 13:54:42 -0400 |
| commit | b2f1e97eaa7d3e7f115c358caa0bbf49a46d737b (patch) | |
| tree | c1098b913627b5503c4762346b4cf0751c4e42db | |
| parent | 00d6cceb92b2dd60a626406370ea5a1473ee56ca (diff) | |
Fix distribution latest tag
Eliminating the patch - using Rashmi's changes.
Issue-ID: POLICY-1737
Change-Id: I4a790b3da6de823bb744af270f541c0699ed8092
Signed-off-by: pdragosh <pdragosh@research.att.com>
| -rw-r--r-- | packages/policy-distribution-docker/pom.xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/packages/policy-distribution-docker/pom.xml b/packages/policy-distribution-docker/pom.xml index 1e6a606c..02d9658e 100644 --- a/packages/policy-distribution-docker/pom.xml +++ b/packages/policy-distribution-docker/pom.xml @@ -61,19 +61,19 @@ </goals> <configuration> <source> - println 'Project version: ' + project.properties['dist.project.version']; - def versionArray; - if ( project.properties['dist.project.version'] != null ) { - versionArray = project.properties['dist.project.version'].split('-'); + println 'Project version: ' + project.properties['dist.project.version'] + if (project.properties['dist.project.version'] != null) { + def versionArray = project.properties['dist.project.version'].split('-') + def minMaxVersionArray = versionArray[0].tokenize('.') + if (project.properties['dist.project.version'].endsWith("-SNAPSHOT")) { + project.properties['project.docker.latest.minmax.tag.version'] = + minMaxVersionArray[0] + "." + minMaxVersionArray[1] + "-SNAPSHOT-latest" + } else { + project.properties['project.docker.latest.minmax.tag.version'] = + minMaxVersionArray[0] + "." + minMaxVersionArray[1] + "-STAGING-latest" + } + println 'New tag for docker: ' + project.properties['project.docker.latest.minmax.tag.version'] } - - if ( project.properties['dist.project.version'].endsWith("-SNAPSHOT") ) { - project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest"; - } - - println 'New tag for docker: ' + project.properties['project.docker.latesttag.version']; </source> </configuration> </execution> @@ -100,7 +100,7 @@ <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</tag> + <tag>${project.docker.latest.minmax.tag.version}</tag> </tags> <assembly> <inline> |