diff options
Diffstat (limited to 'odlsli/pom.xml')
| -rw-r--r-- | odlsli/pom.xml | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 3e72e7b6..b6842b79 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -25,6 +25,7 @@ <properties> <image.name>onap/ccsdk-odlsli-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> + <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> <ccsdk.features.version>0.3.3</ccsdk.features.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> @@ -242,22 +243,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> @@ -497,9 +483,9 @@ <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> + <tag>${project.docker.latestminortag.version}</tag> + <tag>${project.docker.latestfulltag.version}</tag> + <tag>${project.docker.latesttagtimestamp.version}</tag> </tags> </build> </image> |