Re-enable docker build

* re-enable after seed code temporary workaround
* move docker build from package to deploy phase

Change-Id: Ic338247590b019c90cf9241075a255bfaff28c5b
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Issue-ID: DCAEGEN2-653

diff --git a/hv-collector-dcae-app-simulator/pom.xml b/hv-collector-dcae-app-simulator/pom.xml
index e38e3cd..bca1dbb 100644 (file)
--- a/hv-collector-dcae-app-simulator/pom.xml
+++ b/hv-collector-dcae-app-simulator/pom.xml
@@ -71,12 +71,10 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
                     </plugin>
-                    <!-- TODO: unskip docker
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                     </plugin>
-                    -->
                 </plugins>
             </build>
         </profile>

diff --git a/hv-collector-main/pom.xml b/hv-collector-main/pom.xml
index 1208e15..e594aef 100644 (file)
--- a/hv-collector-main/pom.xml
+++ b/hv-collector-main/pom.xml
@@ -72,12 +72,10 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
                     </plugin>
-                    <!-- TODO: unskip docker
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                     </plugin>
-                    -->
                 </plugins>
             </build>
         </profile>

diff --git a/hv-collector-xnf-simulator/pom.xml b/hv-collector-xnf-simulator/pom.xml
index 29d557a..a0b927f 100644 (file)
--- a/hv-collector-xnf-simulator/pom.xml
+++ b/hv-collector-xnf-simulator/pom.xml
@@ -71,12 +71,10 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
                     </plugin>
-                    <!-- TODO: unskip docker
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                     </plugin>
-                    -->
                 </plugins>
             </build>
         </profile>

diff --git a/pom.xml b/pom.xml
index 25400ef..befd8a6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
         <skipAnalysis>true</skipAnalysis>
 
         <!-- Docker -->
-        <skipDocker>true</skipDocker> <!-- TODO: unskip docker -->
+        <skipDocker>false</skipDocker>
         <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily>
         <onap.nexus.dockerregistry.release>nexus3.onap.org:10002</onap.nexus.dockerregistry.release>
         <docker-image.registry>${onap.nexus.dockerregistry.daily}</docker-image.registry>
@@ -387,20 +387,51 @@
             <build>
                 <pluginManagement>
                     <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-dependency-plugin</artifactId>
+                            <version>3.1.1</version>
+                            <executions>
+                                <execution>
+                                    <id>docker-copy-internal-deps</id>
+                                    <phase>package</phase>
+                                    <goals>
+                                        <goal>copy-dependencies</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${project.build.directory}/libs/internal</outputDirectory>
+                                        <includeGroupIds>${project.parent.groupId}</includeGroupIds>
+                                        <includeScope>runtime</includeScope>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>docker-copy-external-deps</id>
+                                    <phase>package</phase>
+                                    <goals>
+                                        <goal>copy-dependencies</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${project.build.directory}/libs/external</outputDirectory>
+                                        <excludeGroupIds>${project.parent.groupId}</excludeGroupIds>
+                                        <includeScope>runtime</includeScope>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
                         <plugin>
                             <groupId>io.fabric8</groupId>
                             <artifactId>docker-maven-plugin</artifactId>
                             <version>0.26.0</version>
                             <executions>
                                 <execution>
-                                    <id>build-docker-image</id>
-                                    <phase>pre-integration-test</phase>
+                                    <id>docker-build-image</id>
+                                    <phase>deploy</phase>
                                     <goals>
                                         <goal>build</goal>
                                     </goals>
                                 </execution>
                                 <execution>
-                                    <id>push-docker-image</id>
+                                    <id>docker-push-image</id>
                                     <phase>deploy</phase>
                                     <goals>
                                         <goal>push</goal>
@@ -425,37 +456,6 @@
                                 </images>
                             </configuration>
                         </plugin>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-dependency-plugin</artifactId>
-                            <version>3.1.1</version>
-                            <executions>
-                                <execution>
-                                    <id>copy-internal-deps</id>
-                                    <phase>package</phase>
-                                    <goals>
-                                        <goal>copy-dependencies</goal>
-                                    </goals>
-                                    <configuration>
-                                        <outputDirectory>${project.build.directory}/libs/internal</outputDirectory>
-                                        <includeGroupIds>${project.parent.groupId}</includeGroupIds>
-                                        <includeScope>runtime</includeScope>
-                                    </configuration>
-                                </execution>
-                                <execution>
-                                    <id>copy-external-deps</id>
-                                    <phase>package</phase>
-                                    <goals>
-                                        <goal>copy-dependencies</goal>
-                                    </goals>
-                                    <configuration>
-                                        <outputDirectory>${project.build.directory}/libs/external</outputDirectory>
-                                        <excludeGroupIds>${project.parent.groupId}</excludeGroupIds>
-                                        <includeScope>runtime</includeScope>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
                     </plugins>
                 </pluginManagement>
             </build>