X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=alpine%2Fpom.xml;h=3aebe9540330f4184445e784840016c92454cfe2;hb=3894b3ff9c68db163b81efe9e46966179a487757;hp=a60dd1a2ec2d2d847cd7ae3aac58f14cdd0b9bfc;hpb=b1ac7253c276b1848a37f8e16d8aab93e643a97e;p=ccsdk%2Fdistribution.git
diff --git a/alpine/pom.xml b/alpine/pom.xml
index a60dd1a2..3aebe954 100644
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -5,11 +5,11 @@
org.onap.ccsdk.distribution
distribution-root
- 0.4.0-SNAPSHOT
+ 0.4.1-SNAPSHOT
distribution-alpine
- 0.4.0-SNAPSHOT
+ 0.4.1-SNAPSHOT
pom
ccsdk-distribution :: alpine
@@ -21,6 +21,7 @@
onap/ccsdk-alpine-image
${project.version}
+ ${maven.build.timestamp}
@@ -35,24 +36,8 @@
execute
-
-
- 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'];
-
+
+ ${basedir}/../src/main/scripts/TagVersion.groovy
@@ -106,9 +91,9 @@
${basedir}/target/docker-stage
Dockerfile
- ${project.version}
- ${project.version}-STAGING-${maven.build.timestamp}
- ${project.docker.latesttag.version}
+ ${project.docker.latestminortag.version}
+ ${project.docker.latestfulltag.version}
+ ${project.docker.latesttagtimestamp.version}