X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=dgbuilder-docker%2Fpom.xml;h=f969e5bf61bd4864a921788ed7602f7fb04231d7;hp=ef72f1d947a0d72fd52b85ca1657a7d311bd3a51;hb=HEAD;hpb=912f98b9cdfe0f636239b8f94fccf7858bffac26

diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index ef72f1d9..685cd1ec 100644
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.onap.ccsdk.distribution</groupId>
-		<artifactId>distribution-root</artifactId>
-		<version>0.2.1-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-root</artifactId>
+        <version>1.6.1-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.onap.ccsdk.distribution</groupId>
-	<artifactId>distribution-dgbuilder-docker</artifactId>
-	<version>0.2.1-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.distribution</groupId>
+    <artifactId>distribution-dgbuilder-docker</artifactId>
+    <packaging>pom</packaging>
 
-	<name>ccsdk-distribution :: dgbuilder-docker</name>
-	<description>Creates docker container for dgbuilder</description>
-	<organization>
-		<name>ONAP</name>
-	</organization>
+    <name>ccsdk-distribution :: dgbuilder-docker</name>
+    <description>Creates docker container for dgbuilder</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
-	<properties>
-		<image.name>onap/ccsdk-dgbuilder-image</image.name>
-		<ccsdk.project.version>${project.version}</ccsdk.project.version>
-	</properties>
-
-	<build>
-		<plugins>
+    <properties>
+        <image.name>onap/ccsdk-dgbuilder-image</image.name>
+    </properties>
 
+    <build>
+        <plugins>
 
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -38,194 +36,178 @@
                             <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/TagSnapshotVersion.groovy</source>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-					<execution>
-						<id>copy-dockerfile</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals><!-- here the phase you need -->
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/docker</directory>
-									<includes>
-										<include>Dockerfile</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<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/onap/sdnc</argument>
-                            				</arguments>
-                        			</configuration>
-                    			</execution>
-                    			<execution>
-                        			<id>Unzip dgbuilder</id>
-                        			<phase>generate-sources</phase>
-                        			<goals>
-                            				<goal>exec</goal>
-                        			</goals>
-                        			<configuration>
-                            				<executable>/usr/bin/unzip</executable>
-                            				<arguments>
-                                			<argument>-d</argument>
-                                			<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
-                                			<argument>../dgbuilder/target/*.zip</argument>
-                            				</arguments>
-                        			</configuration>
-                    			</execution>
-					<execution>
-						<id>Copy dgbuilder</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>/bin/cp</executable>
-							<arguments>
-								<argument>-r</argument>
-								<argument>../dgbuilder</argument>
-								<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
-							</arguments>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>dgbuilder createReleaseDir</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>/bin/bash</executable>
-							<arguments>
-								<argument>${basedir}/target/docker-stage/opt/onap/sdnc/dgbuilder/createReleaseDir.sh</argument>
-								<argument>1702</argument>
-								<argument>dguser</argument>
-								<argument>change_email_id@dgbuilder.com</argument>
-							</arguments>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>change shell permissions</id>
-                        			<phase>process-sources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>/usr/bin/find</executable>
-							<arguments>
-								<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
-								<argument>-name</argument>
-								<argument>*.sh</argument>
-								<argument>-exec</argument>
-								<argument>chmod</argument>
-								<argument>+x</argument>
-								<argument>{}</argument>
-								<argument>;</argument>
-							</arguments>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-dockerfile</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <includes>
+                                        <include>Dockerfile</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>make-stage-dir</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <target>
+                                <mkdir dir="${basedir}/target/docker-stage/opt/onap/ccsdk"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>unzip-dgbuilder</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <target>
+                                <unzip dest="${basedir}/target/docker-stage/opt/onap/ccsdk">
+                                    <fileset dir="${basedir}/../dgbuilder/target/">
+                                        <include name="**/*.zip"/>
+                                    </fileset>
+                                </unzip>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>copy-dgbuilder</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <target>
+                                <copy todir="${basedir}/target/docker-stage/opt/onap/ccsdk/dgbuilder">
+                                    <fileset dir="${basedir}/../dgbuilder" excludes="target/**"/>
+                                </copy>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>change shell permissions</id>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <target>
+                                <chmod dir="${basedir}/target/docker-stage/opt/onap/ccsdk" perm="+x" includes="**/*.sh"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
-	<profiles>
+    <profiles>
+        <profile>
+            <id>unix</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                </os>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.5.0</version>
+                        <executions>
+                            <!-- TODO: Need to see alternate for below, so that it can execute on Windows Environment -->
+                            <execution>
+                                <id>dgbuilder-createReleaseDir</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>/bin/bash</executable>
+                                    <arguments>
+                                        <argument>${basedir}/target/docker-stage/opt/onap/ccsdk/dgbuilder/createReleaseDir.sh</argument>
+                                        <argument>1702</argument>
+                                        <argument>dguser</argument>
+                                        <argument>change_email_id@dgbuilder.com</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>docker</id>
             <build>
                 <plugins>
-			<plugin>
-				<groupId>io.fabric8</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.16.5</version>
-				<inherited>false</inherited>
-				<configuration>
-
-					<images>
-                                		<image>
-                                    			<name>${image.name}</name>
-                                    			<build>
-                                        			<cleanup>try</cleanup>
-                                        			<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>
-                                    			</build>
-						</image>
-					</images>
-				</configuration>
-				<executions>
-					<execution>
-						<id>generate-images</id>
-						<phase>package</phase>
-						<goals>
-							<goal>build</goal>
-						</goals>
-					</execution>
-
-					<execution>
-						<id>push-images</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>build</goal>
-							<goal>push</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.34.0</version>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${image.name}</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <noCache>true</noCache>
+                                        <contextDir>${basedir}/target/docker-stage</contextDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <tags>
+                                            <tag>${project.docker.latestminortag.snapshot.version}</tag>
+                                            <tag>${project.docker.latestfulltag.snapshot.version}</tag>
+                                            <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                            <verbose>${docker.verbose}</verbose>
+                            <skipPush>${docker.skip.push}</skipPush>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>build-push-images</id>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 </project>