diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-02-14 13:52:48 -0500 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-02-14 15:07:48 -0500 |
| commit | 2f1f361402db53f3e5d133e482e7e9b3dfd2305c (patch) | |
| tree | 843885357a42351b95c1f9db1fa0cc61ce3cda0e /ms/controllerblueprints | |
| parent | d1acee662bfb0125a85fffdcbfebcf9cc0d6ed87 (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/controllerblueprints')
| -rwxr-xr-x | ms/controllerblueprints/distribution/pom.xml | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/ms/controllerblueprints/distribution/pom.xml b/ms/controllerblueprints/distribution/pom.xml index 91d4bbca0..c73d15b6e 100755 --- a/ms/controllerblueprints/distribution/pom.xml +++ b/ms/controllerblueprints/distribution/pom.xml @@ -34,6 +34,8 @@ <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <docker.push.phase>deploy</docker.push.phase> <docker.verbose>true</docker.verbose> + <ccsdk.project.version>${project.version}</ccsdk.project.version> + <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> </properties> <dependencies> @@ -120,22 +122,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> @@ -162,9 +149,9 @@ <cleanup>try</cleanup> <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> <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> |