Control docker build with profile

Docker build should only be run if docker profile is enabled.

Change-Id: I6942c3e59b769053fd47d04fe98f3e4b95ea33dd
Issue-ID: CCSDK-558
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>

diff --git a/.gitignore b/.gitignore
index c47edf3..82cae9e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,14 @@
 \r
 **/*versionsBackup\r
 **/blackDuckHub*\r
-**/*.jsonld
\ No newline at end of file
+**/*.jsonld\r
+**/.checkstyle\r
+**/.gitignore\r
+**/.gitignore\r
+**/.gitignore\r
+**/.gitignore\r
+**/.gitignore\r
+**/.gitignore\r
+**/.gitignore\r
+**/.gitignore\r
+\r

diff --git a/ms/controllerblueprints/.gitignore b/ms/controllerblueprints/.gitignore
index 644e3b4..8cda363 100644 (file)
--- a/ms/controllerblueprints/.gitignore
+++ b/ms/controllerblueprints/.gitignore
@@ -20,4 +20,5 @@
 \r
 **/*versionsBackup\r
 **/blackDuckHub*\r
-**/*.jsonld
\ No newline at end of file
+**/*.jsonld
+/target-ide/

diff --git a/ms/controllerblueprints/application/pom.xml b/ms/controllerblueprints/application/pom.xml
index 38f81c1..24f4deb 100644 (file)
--- a/ms/controllerblueprints/application/pom.xml
+++ b/ms/controllerblueprints/application/pom.xml
@@ -198,5 +198,7 @@
             </plugin>\r
         </plugins>\r
     </build>\r
+    \r
+    \r
 </project>\r
 \r

diff --git a/ms/controllerblueprints/distribution/pom.xml b/ms/controllerblueprints/distribution/pom.xml
index 37c0b84..7a2c679 100644 (file)
--- a/ms/controllerblueprints/distribution/pom.xml
+++ b/ms/controllerblueprints/distribution/pom.xml
@@ -34,7 +34,10 @@
         <name.space>org.onap.ccsdk.apps</name.space>     <!-- <name.space>${namespace}</name.space> -->\r
         <serviceArtifactName>controllerblueprints</serviceArtifactName>\r
         <image.name>onap/ccsdk-controllerblueprints</image.name>\r
-    </properties>\r
+               <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>\r
+               <docker.push.phase>deploy</docker.push.phase>\r
+               <docker.verbose>true</docker.verbose>\r
+       </properties>\r
 \r
     <dependencies>\r
         <dependency>\r
@@ -141,47 +144,52 @@
                     </execution>\r
                 </executions>\r
             </plugin>\r
-            <plugin>\r
-                <groupId>io.fabric8</groupId>\r
-                <artifactId>docker-maven-plugin</artifactId>\r
-                <version>0.26.1</version>\r
-                <inherited>false</inherited>\r
-                <configuration>\r
-                    <images>\r
-                        <image>\r
-                            <name>${image.name}</name>\r
-                            <build>\r
-                                <cleanup>try</cleanup>\r
-                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>\r
-                                <tags>\r
-                                    <tag>${project.version}</tag>\r
-                                    <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>\r
-                                    <tag>${project.docker.latesttag.version}</tag>\r
-                                </tags>\r
-                            </build>\r
-                        </image>\r
-                    </images>\r
-                    <verbose>true</verbose>\r
-                </configuration>\r
-                <executions>\r
-                    <!--<execution>-->\r
-                        <!--<id>build-images</id>-->\r
-                        <!--<phase>package</phase>-->\r
-                        <!--<goals>-->\r
-                            <!--<goal>build</goal>-->\r
-                        <!--</goals>-->\r
-                    <!--</execution>-->\r
-                    <execution>\r
-                        <id>push-images</id>\r
-                        <phase>deploy</phase>\r
-                        <goals>\r
-                            <goal>build</goal>\r
-                            <goal>push</goal>\r
-                        </goals>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
+\r
         </plugins>\r
     </build>\r
+\r
+       <profiles>\r
+               <profile>\r
+                       <id>docker</id>\r
+                       <build>\r
+                               <plugins>\r
+                                       <plugin>\r
+                                               <groupId>io.fabric8</groupId>\r
+                                               <artifactId>docker-maven-plugin</artifactId>\r
+                                               <version>0.26.1</version>\r
+                                               <inherited>false</inherited>\r
+                                               <configuration>\r
+                                                       <images>\r
+                                                               <image>\r
+                                                                       <name>${image.name}</name>\r
+                                                                       <build>\r
+                                                                               <cleanup>try</cleanup>\r
+                                                                               <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>\r
+                                                                               <tags>\r
+                                                                                       <tag>${project.version}</tag>\r
+                                                                                       <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>\r
+                                                                                       <tag>${project.docker.latesttag.version}</tag>\r
+                                                                               </tags>\r
+                                                                       </build>\r
+                                                               </image>\r
+                                                       </images>\r
+                                                       <verbose>true</verbose>\r
+                                               </configuration>\r
+                                               <executions>\r
+                                                       <execution>\r
+                                                               <id>push-images</id>\r
+                                                               <phase>${docker.build.phase}</phase>\r
+                                                               <goals>\r
+                                                                       <goal>build</goal>\r
+                                                                       <goal>push</goal>\r
+                                                               </goals>\r
+                                                       </execution>\r
+                                               </executions>\r
+                                       </plugin>\r
+                               </plugins>\r
+                       </build>\r
+               </profile>\r
+\r
+       </profiles>\r
 </project>\r
 \r

diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index 8390350..0c5832a 100644 (file)
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -54,6 +54,10 @@
         <serviceArtifactName>ms-networkelementnamegen</serviceArtifactName>
         <project.version>0.3.0</project.version>
         <ccsdk.distribution.version>0.2.4</ccsdk.distribution.version>
+        <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+               <docker.push.phase>deploy</docker.push.phase>
+               <docker.verbose>true</docker.verbose>
+               <ccsdk.project.version>${project.version}</ccsdk.project.version>
     </properties>
 
     <profiles>
@@ -109,6 +113,63 @@
             </build>
         </profile>
 
+       <profile>
+               <id>docker</id>
+               <build>
+                       <plugins>
+                               <plugin>
+                                       <groupId>com.spotify</groupId>
+                                       <artifactId>docker-maven-plugin</artifactId>
+                                       <version>0.4.11</version>
+                                       <configuration>
+                                               <imageName>onap/ccsdk-apps-ms-neng:${project.version}</imageName>
+                                               <dockerDirectory>src/main/docker</dockerDirectory>
+                                               <serverId>docker-hub</serverId>
+                                               <registryUrl>https://${docker.registry}</registryUrl>
+                                               <imageTags>
+                                                       <imageTag>${project.version}</imageTag>
+                                                       <imageTag>${project.version}-STAGING-${maven.build.timestamp}</imageTag>
+                                                       <imageTag>${project.docker.latesttag.version}</imageTag>
+                                               </imageTags>
+                                               <forceTags>true</forceTags>
+                                               <resources>
+                                                       <resource>
+                                                               <targetPath>/</targetPath>
+                                                               <directory>${project.build.directory}</directory>
+                                                               <include>${project.build.finalName}.jar</include>
+                                                       </resource>
+                                                       <resource>
+                                                               <targetPath>/</targetPath>
+                                                               <directory>${project.build.directory}</directory>
+                                                               <include>opt/etc/config/*</include>
+                                                       </resource>
+                                                       <resource>
+                                                               <targetPath>/</targetPath>
+                                                               <directory>${project.build.directory}</directory>
+                                                               <include>opt/etc/keystore/*</include>
+                                                       </resource>
+                                                       <resource>
+                                                               <targetPath>/</targetPath>
+                                                               <directory>${project.build.directory}</directory>
+                                                               <include>opt/etc/truststore/*</include>
+                                                       </resource>
+                                                       <resource>
+                                                               <targetPath>/</targetPath>
+                                                               <directory>${project.build.directory}</directory>
+                                                               <include>opt/aai/keystore/*</include>
+                                                       </resource>
+                                                       <resource>
+                                                               <targetPath>/</targetPath>
+                                                               <directory>${project.build.directory}</directory>
+                                                               <include>etc/*</include>
+                                                       </resource>
+                                               </resources>
+                                       </configuration>
+                               </plugin>
+                       </plugins>
+               </build>
+       </profile>
+
     </profiles>
 
     <developers>
@@ -259,6 +320,37 @@
     <build>
         <finalName>NetworkElementNameGen</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <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>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
@@ -433,54 +525,7 @@
             </plugin>
             -->
 
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.4.11</version>
-                <configuration>
-                    <imageName>onap/ccsdk-apps-ms-neng:${project.version}</imageName>
-                    <dockerDirectory>src/main/docker</dockerDirectory>
-                    <serverId>docker-hub</serverId>
-                    <registryUrl>https://${docker.registry}</registryUrl>
-                    <imageTags>
-                        <imageTag>${project.version}</imageTag>
-                        <imageTag>latest</imageTag>
-                    </imageTags>
-                    <forceTags>true</forceTags>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>opt/etc/config/*</include>
-                        </resource>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>opt/etc/keystore/*</include>
-                        </resource>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>opt/etc/truststore/*</include>
-                        </resource>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>opt/aai/keystore/*</include>
-                        </resource>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>etc/*</include>
-                        </resource>
-                    </resources>
-                </configuration>
-            </plugin>
+ 
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -593,5 +638,6 @@
             </plugins>
         </pluginManagement>
     </build>
+    
 </project>
 

diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml
index 431d0a3..6303640 100644 (file)
--- a/ms/vlantag-api/pom.xml
+++ b/ms/vlantag-api/pom.xml
@@ -33,6 +33,10 @@
                <sonar.jacoco.itReportPath>${basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath>
                <sonar.language>java</sonar.language>
                <ilib.version>2.0.7</ilib.version>
+               <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+               <docker.push.phase>deploy</docker.push.phase>
+               <docker.verbose>true</docker.verbose>
+               <ccsdk.project.version>${project.version}</ccsdk.project.version>
        </properties>
 
        <parent>
@@ -98,6 +102,37 @@
 
        <build>
                <plugins>
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <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>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
                    <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -224,5 +259,39 @@
                </plugins>
        </build>
 
+       <profiles>
+               <profile>
+                       <id>docker</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>com.spotify</groupId>
+                                               <artifactId>docker-maven-plugin</artifactId>
+                                               <version>0.4.11</version>
+                                               <configuration>
+                                                       <imageName>${docker.registry}/org.onap.ccsdk.apps/${serviceArtifactName}</imageName>
+                                                       <dockerDirectory>src/main/docker</dockerDirectory>
+                                                       <serverId>docker-hub</serverId>
+                                                       <registryUrl>https://${docker.registry}</registryUrl>
+                                                       <imageTags>
+                                                               <imageTag>${project.version}</imageTag>
+                                                               <imageTag>${project.version}-STAGING-${maven.build.timestamp}</imageTag>
+                                                           <imageTag>${project.docker.latesttag.version}</imageTag>
+                                                       </imageTags>
+                                                       <forceTags>true</forceTags>
+                                                       <resources>
+                                                               <resource>
+                                                                       <targetPath>/</targetPath>
+                                                                       <directory>${project.build.directory}</directory>
+                                                                       <include>${project.build.finalName}.jar</include>
+                                                               </resource>
+                                                       </resources>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+
 
 </project>