[DOCKER] Update tag

[sdnc/oam.git] / installation / dgbuilder / pom.xml

diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index 73963bc..33302bc 100644 (file)
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -5,14 +5,14 @@
        <parent>
                <groupId>org.openecomp.sdnc.oam</groupId>
                <artifactId>installation</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.1-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.openecomp.sdnc.oam</groupId>
        <artifactId>installation-dgbuilder</artifactId>
-       <version>1.1.0-SNAPSHOT</version>
+       <version>1.1.1-SNAPSHOT</version>
 
        <name>Installation - dgbuilder</name>
        <description>Creates docker container for dgbuilder</description>
@@ -41,19 +41,14 @@
                                                                println project.properties['sdnc.project.version'];
                                                                def versionArray;
                                                                if ( project.properties['sdnc.project.version'] != null ) {
-                                                               versionArray =
-                                                               project.properties['sdnc.project.version'].split('\\.');
+                                                                       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";
+                                                               if (project.properties['sdnc.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";
+                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                                                }
 
                                                                println 'New Tag for docker:' +
@@ -78,6 +73,7 @@
                                                                <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>
                                                                </tags>
@@ -88,7 +84,7 @@
                                <executions>
                                        <execution>
                                                <id>generate-images</id>
-                                               <phase>generate-sources</phase>
+                                               <phase>package</phase>
                                                <goals>
                                                        <goal>build</goal>
                                                </goals>
@@ -135,6 +131,20 @@
                                <groupId>org.codehaus.mojo</groupId>
                                <version>1.5.0</version>
                                <executions>
+                                       <execution>
+                                               <id>Make-stage-dir</id>
+                                               <phase>generate-sources</phase>
+                                               <goals>
+                                                       <goal>exec</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <executable>/bin/mkdir</executable>
+                                                       <arguments>
+                                                       <argument>-p</argument>
+                                                       <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+                                                       </arguments>
+                                               </configuration>
+                                       </execution>
                                        <execution>
                                                <id>Unzip dgbuilder</id>
                                                <phase>generate-sources</phase>