X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=inline;f=dgbuilder-docker%2Fpom.xml;h=5af9d886fe9ebc3c877dad310409cfbd85437bf7;hb=b11d58dcac29a29aeb639a8be2f55408e3f06587;hp=703420d391f4d465ecf017b23448b9367001903a;hpb=52cecb1b738257bc7e32f86cb03213467e1c83e2;p=ccsdk%2Fdistribution.git
diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index 703420d3..5af9d886 100644
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -5,12 +5,12 @@
org.onap.ccsdk.distribution
distribution-root
- 0.2.4-SNAPSHOT
+ 0.5.0-SNAPSHOT
org.onap.ccsdk.distribution
distribution-dgbuilder-docker
- 0.2.4-SNAPSHOT
+ 0.5.0-SNAPSHOT
pom
ccsdk-distribution :: dgbuilder-docker
@@ -22,43 +22,28 @@
onap/ccsdk-dgbuilder-image
${project.version}
+ ${maven.build.timestamp}
-
- org.codehaus.groovy.maven
- gmaven-plugin
-
-
- validate
-
- 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'];
-
-
-
-
-
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ validate
+
+ execute
+
+
+ ${basedir}/../src/main/scripts/TagVersion.groovy
+
+
+
+
maven-resources-plugin
2.6
@@ -90,35 +75,35 @@
exec-maven-plugin
1.5.0
-
- Make-stage-dir
- generate-sources
-
- exec
-
-
- /bin/mkdir
-
- -p
- ${basedir}/target/docker-stage/opt/onap/ccsdk
-
-
-
-
- Unzip dgbuilder
- generate-sources
-
- exec
-
-
- /usr/bin/unzip
-
- -d
- ${basedir}/target/docker-stage/opt/onap/ccsdk
- ../dgbuilder/target/*.zip
-
-
-
+
+ Make-stage-dir
+ generate-sources
+
+ exec
+
+
+ /bin/mkdir
+
+ -p
+ ${basedir}/target/docker-stage/opt/onap/ccsdk
+
+
+
+
+ Unzip dgbuilder
+ generate-sources
+
+ exec
+
+
+ /usr/bin/unzip
+
+ -d
+ ${basedir}/target/docker-stage/opt/onap/ccsdk
+ ../dgbuilder/target/*.zip
+
+
+
Copy dgbuilder
generate-sources
@@ -154,7 +139,7 @@
change shell permissions
- process-sources
+ process-sources
exec
@@ -175,57 +160,57 @@
-
+
-
- docker
-
-
-
- io.fabric8
- docker-maven-plugin
- 0.16.5
- false
-
+
+ docker
+
+
+
+ io.fabric8
+ docker-maven-plugin
+ 0.28.0
+ false
+
-
-
- ${image.name}
-
- try
- ${basedir}/target/docker-stage
- ${basedir}/target/docker-stage/Dockerfile
-
- ${project.version}
- ${project.version}-STAGING-${maven.build.timestamp}
- ${project.docker.latesttag.version}
-
-
-
-
-
-
-
- generate-images
- package
-
- build
-
-
+
+
+ ${image.name}
+
+ try
+ ${basedir}/target/docker-stage
+ Dockerfile
+
+ ${project.docker.latestminortag.version}
+ ${project.docker.latestfulltag.version}
+ ${project.docker.latesttagtimestamp.version}
+
+
+
+
+
+
+
+ generate-images
+ package
+
+ build
+
+
-
- push-images
- deploy
-
- build
- push
-
-
-
-
-
-
-
-
+
+ push-images
+ deploy
+
+ build
+ push
+
+
+
+
+
+
+
+