X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fdgbuilder%2Fpom.xml;h=c89c766a404056325b921176a191db359ff927dc;hb=refs%2Fchanges%2F17%2F3717%2F1;hp=daef986573c75264cf957fc4c12de146fc9accac;hpb=ff3d7bedc2d05dae310355da7984b6f52fe2e3cc;p=sdnc%2Foam.git
diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index daef9865..c89c766a 100644
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -5,20 +5,21 @@
org.openecomp.sdnc.oam
installation
- 1.1.0-SNAPSHOT
+ 1.1.1-SNAPSHOT
4.0.0
pom
org.openecomp.sdnc.oam
installation-dgbuilder
- 1.1.0-SNAPSHOT
+ 1.1.1-SNAPSHOT
Installation - dgbuilder
Creates docker container for dgbuilder
- ecomp/dgbuilder-sdnc-image
+ openecomp/dgbuilder-sdnc-image
+ ${project.version}
@@ -26,6 +27,37 @@
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ validate
+
+ execute
+
+
+
+ println project.properties['sdnc.project.version'];
+ def versionArray;
+ if ( project.properties['sdnc.project.version'] != null ) {
+ versionArray =
+ project.properties['sdnc.project.version'].split('\\.');
+ }
+
+ if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
+ project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-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'];
+
+
+
+
+
io.fabric8
docker-maven-plugin
@@ -42,7 +74,8 @@
${basedir}/target/docker-stage/Dockerfile
${project.version}
- latest
+ ${project.version}-STAGING-${maven.build.timestamp}
+ ${project.docker.latesttag.version}
@@ -51,7 +84,7 @@
generate-images
- process-sources
+ package
build
@@ -98,20 +131,35 @@
org.codehaus.mojo
1.5.0
-
- make-path
- generate-sources
-
- exec
-
-
- /bin/mkdir
-
- -p
- ${basedir}/target/docker-stage/opt/openecomp/sdnc
-
-
-
+
+ Make-stage-dir
+ generate-sources
+
+ exec
+
+
+ /bin/mkdir
+
+ -p
+ ${basedir}/target/docker-stage/opt/openecomp/sdnc
+
+
+
+
+ Unzip dgbuilder
+ generate-sources
+
+ exec
+
+
+ /usr/bin/unzip
+
+ -d
+ ${basedir}/target/docker-stage/opt/openecomp/sdnc
+ ../../dgbuilder/target/*.zip
+
+
+
Copy dgbuilder
generate-sources
@@ -137,7 +185,7 @@
/bin/bash
- ${basedir}/target/docker-stage/opt/openecomp/sdnc/dgbuilder/createReleaseDir
+ ${basedir}/target/docker-stage/opt/openecomp/sdnc/dgbuilder/createReleaseDir.sh
1702
dguser
change_email_id@dgbuilder.com
@@ -147,7 +195,7 @@
change shell permissions
- process-sources
+ process-sources
exec