Fix pom for docker files

Fix poms for docker files so the docker job would run

Change-Id: Ie14e334e1c88689a090c4d5c1ed5da469df85e9b
Issue-ID: SDC-1339
Signed-off-by: Stone, Avi (as206k) <as206k@att.com>

diff --git a/dcaedt_be/pom.xml b/dcaedt_be/pom.xml
index ee6e5ab..2bd614a 100644 (file)
--- a/dcaedt_be/pom.xml
+++ b/dcaedt_be/pom.xml
@@ -182,6 +182,61 @@
                                                                </execution>
                                                </executions>
                                </plugin>
+                               <plugin>
+                                               <groupId>io.fabric8</groupId>
+                                               <artifactId>docker-maven-plugin</artifactId>
+                                               <version>0.23.0</version>
+                                               <configuration>
+                                                               <verbose>true</verbose>
+                                                               <apiVersion>1.23</apiVersion>
+                                                               <images>
+                                                                               <!-- Build backend image -->
+                                                                               <image>
+                                                                                               <name>onap/dcae-be</name>
+                                                                                               <alias>dcae-be</alias>
+                                                                                               <build>
+                                                                                                               <cleanup>try</cleanup>
+                                                                                                               <dockerFileDir>${project.parent.basedir}/docker/docker_be</dockerFileDir>
+                                                                                                               <tags>
+                                                                                                                               <tag>${docker.tag}</tag>
+                                                                                                                               <tag>${docker.latest.tag}</tag>
+                                                                                                                               <tag>${docker.staging.tag}</tag>
+                                                                                                                </tags>
+                                                                                               </build>
+                                                                               </image>
+                                                               </images>
+                                               </configuration>
+                                               <executions>
+                                                               <execution>
+                                                                               <id>clean-images</id>
+                                                                               <phase>pre-clean</phase>
+                                                                               <goals>
+                                                                                               <goal>remove</goal>
+                                                                               </goals>
+                                                                               <configuration>
+                                                                                               <removeAll>true</removeAll>
+                                                                                               <image>onap/dcae-be</image>
+                                                                               </configuration>
+                                                               </execution>
+                                                               <execution>
+                                                                               <id>generate-images</id>
+                                                                               <phase>package</phase>
+                                                                               <goals>
+                                                                                               <goal>build</goal>
+                                                                               </goals>
+                                                               </execution>
+                                                               <execution>
+                                                                               <id>push-images</id>
+                                                                               <phase>deploy</phase>
+                                                                               <goals>
+                                                                                               <goal>push</goal>
+                                                                               </goals>
+                                                                               <configuration>
+                                                                                               <image>onap/dcae-be</image>
+                                                                               </configuration>
+                                                               </execution>
+                                               </executions>
+                               </plugin>
                        </plugins>
                </build>
                </profile>

diff --git a/dcaedt_tools/pom.xml b/dcaedt_tools/pom.xml
index 83993f8..4888fad 100644 (file)
--- a/dcaedt_tools/pom.xml
+++ b/dcaedt_tools/pom.xml
@@ -57,6 +57,61 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.23.0</version>
+                <configuration>
+                    <verbose>true</verbose>
+                    <apiVersion>1.23</apiVersion>
+                    <images>
+                        <!-- Build tools image -->
+                        <image>
+                            <name>onap/dcae-tools</name>
+                            <alias>dcae-tools</alias>
+                            <build>
+                                <cleanup>try</cleanup>
+                                <dockerFileDir>${project.parent.basedir}/docker/docker_tools</dockerFileDir>
+                                <tags>
+                                    <tag>${docker.tag}</tag>
+                                    <tag>${docker.latest.tag}</tag>
+                                    <tag>${docker.staging.tag}</tag>
+                                 </tags>
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>clean-images</id>
+                        <phase>pre-clean</phase>
+                        <goals>
+                            <goal>remove</goal>
+                        </goals>
+                        <configuration>
+                            <removeAll>true</removeAll>
+                            <image>onap/dcae-be</image>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-images</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>push-images</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>push</goal>
+                        </goals>
+                        <configuration>
+                            <image>onap/dcae-tools</image>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
           </plugins>
         </build>
       </profile>

diff --git a/pom.xml b/pom.xml
index 46dd6b9..1e66bc6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -129,137 +129,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>3.0.2</version>
-                        <executions>
-                            <execution>
-                                <id>copy-dcae-be-war</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${project.basedir}/docker/docker_be/target</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.basedir}/dcaedt_be/target</directory>
-                                            <includes>
-                                                <include>dcae.war</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>copy-dcae-tools-jar</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${project.basedir}/docker/docker_tools/target</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.basedir}/dcaedt_tools/target</directory>
-                                            <includes>
-                                                <include>dcaedt_tools-${project.version}-jar-with-dependencies.jar</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>copy-dcae-config-json</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${project.basedir}/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.basedir}/dcaedt_tools/src/main/resources/conf</directory>
-                                            <includes>
-                                                <include>config.json</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.23.0</version>
-                        <configuration>
-                            <verbose>true</verbose>
-                            <apiVersion>1.23</apiVersion>
-                            <images>
-                                <!-- Build backend image -->
-                                <image>
-                                    <name>onap/dcae-be</name>
-                                    <alias>dcae-be</alias>
-                                    <build>
-                                        <cleanup>try</cleanup>
-                                        <dockerFileDir>${project.basedir}/docker/docker_be</dockerFileDir>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
-                                            <tag>${docker.staging.tag}</tag>
-                                         </tags>
-                                    </build>
-                                </image>
-
-                                <!-- Build tools image -->
-                                <image>
-                                    <name>onap/dcae-tools</name>
-                                    <alias>dcae-tools</alias>
-                                    <build>
-                                        <cleanup>try</cleanup>
-                                        <dockerFileDir>${project.basedir}/docker/docker_tools</dockerFileDir>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
-                                            <tag>${docker.staging.tag}</tag>
-                                         </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>clean-images</id>
-                                <phase>pre-clean</phase>
-                                <goals>
-                                    <goal>remove</goal>
-                                </goals>
-                                <configuration>
-                                    <removeAll>true</removeAll>
-                                    <image>onap/dcae-be</image>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>generate-images</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>push-images</id>
-                                <phase>deploy</phase>
-                                <goals>
-                                    <goal>push</goal>
-                                </goals>
-                                <configuration>
-                                    <image>onap/dcae-be,onap/dcae-tools</image>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
          </profile>