Fix Broken Docker Builds

Update Pom files and Directory Structure.
Issue-ID: MUSIC-561

Signed-off-by: Thomas Nelson <tn1381@att.com>
Change-Id: I3325b20cc4345e67a356a5cbb1bce7d45904be02

diff --git a/music-core/pom.xml b/music-core/pom.xml
index ae50e64..687ec74 100755 (executable)
--- a/music-core/pom.xml
+++ b/music-core/pom.xml
@@ -450,107 +450,6 @@
         </plugins>
     </reporting>
 
         </plugins>
     </reporting>
 

-    <profiles>
-        <profile>
-            <id>docker</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.19.1</version>
-                        <configuration>
-                            <verbose>true</verbose>
-                            <apiVersion>1.23</apiVersion>
-                            <registry>nexus3.onap.org:10003</registry>
-                            <images>
-                                <!-- MUSIC War -->
-                                <image>
-                                    <name>onap/music/music_sb</name>
-                                    <alias>docker_music</alias>
-                                    <build>
-                                        <cleanup>true</cleanup>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
-                                        </tags>
-                                        <dockerFileDir>${project.basedir}/distribution/music</dockerFileDir>
-<!--                                    <assembly>
-                                            <descriptorRef>artifact</descriptorRef>
-                                        </assembly>  -->
-                                    </build>
-                                </image>
-                                <!-- Cassandra -->
-                                <image>
-                                    <name>onap/music/cassandra_3_11</name>
-                                    <alias>docker_cassandra_sec</alias>
-                                    <build>
-                                        <cleanup>true</cleanup>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
-                                        </tags>
-                                        <dockerFileDir>${project.basedir}/distribution/cassandra</dockerFileDir>
-                                    </build>
-                                </image>
-                                <!-- Cassandra Job -->
-                                <image>
-                                    <name>onap/music/cassandra_job</name>
-                                    <alias>docker_cassandra_job</alias>
-                                    <build>
-                                        <cleanup>true</cleanup>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
-                                        </tags>
-                                        <dockerFileDir>${project.basedir}/distribution/cassandra_job</dockerFileDir>
-                                    </build>
-                                </image>
-                                <!-- tomcat 8.5 -->
-                                <!-- <image> <name>onap/music/tomcat_music</name>
-                                    <alias>docker_tomcat</alias> <build> <cleanup>true</cleanup> <tags> <tag>8.5-${timestamp}</tag>
-                                    <tag>8.5-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/tomcat</dockerFileDir>
-                                    </build> </image>\ -->
-                            </images>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>clean-images</id>
-                                <phase>pre-clean</phase>
-                                <goals>
-                                    <goal>remove</goal>
-                                </goals>
-                                <configuration>
-                                    <removeAll>true</removeAll>
-                                    <image>music</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/music/music</image>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>default</id>
-        </profile>
-    </profiles>

     <distributionManagement>
         <repository>
             <id>ecomp-releases</id>
     <distributionManagement>
         <repository>
             <id>ecomp-releases</id>

diff --git a/distribution/README.md b/music-rest/distribution/README.md
similarity index 100%
rename from distribution/README.md
rename to music-rest/distribution/README.md

diff --git a/distribution/cassandra/Dockerfile b/music-rest/distribution/cassandra/Dockerfile
similarity index 100%
rename from distribution/cassandra/Dockerfile
rename to music-rest/distribution/cassandra/Dockerfile

diff --git a/distribution/cassandra/cassandra.yaml b/music-rest/distribution/cassandra/cassandra.yaml
similarity index 100%
rename from distribution/cassandra/cassandra.yaml
rename to music-rest/distribution/cassandra/cassandra.yaml

diff --git a/distribution/cassandra/docker-entrypoint.sh b/music-rest/distribution/cassandra/docker-entrypoint.sh
similarity index 100%
rename from distribution/cassandra/docker-entrypoint.sh
rename to music-rest/distribution/cassandra/docker-entrypoint.sh

diff --git a/distribution/cassandra_job/Dockerfile b/music-rest/distribution/cassandra_job/Dockerfile
similarity index 100%
rename from distribution/cassandra_job/Dockerfile
rename to music-rest/distribution/cassandra_job/Dockerfile

diff --git a/distribution/cassandra_job/admin.cql b/music-rest/distribution/cassandra_job/admin.cql
similarity index 100%
rename from distribution/cassandra_job/admin.cql
rename to music-rest/distribution/cassandra_job/admin.cql

diff --git a/distribution/cassandra_job/admin_pw.cql b/music-rest/distribution/cassandra_job/admin_pw.cql
similarity index 100%
rename from distribution/cassandra_job/admin_pw.cql
rename to music-rest/distribution/cassandra_job/admin_pw.cql

diff --git a/distribution/cassandra_job/runcql.sh b/music-rest/distribution/cassandra_job/runcql.sh
similarity index 100%
rename from distribution/cassandra_job/runcql.sh
rename to music-rest/distribution/cassandra_job/runcql.sh

diff --git a/distribution/cassandra_job/test.cql b/music-rest/distribution/cassandra_job/test.cql
similarity index 100%
rename from distribution/cassandra_job/test.cql
rename to music-rest/distribution/cassandra_job/test.cql

diff --git a/distribution/music/Dockerfile b/music-rest/distribution/music/Dockerfile
similarity index 100%
rename from distribution/music/Dockerfile
rename to music-rest/distribution/music/Dockerfile

diff --git a/distribution/music/startup.sh b/music-rest/distribution/music/startup.sh
similarity index 100%
rename from distribution/music/startup.sh
rename to music-rest/distribution/music/startup.sh

diff --git a/music-rest/pom.xml b/music-rest/pom.xml
index 6c611e8..f949ae5 100755 (executable)
--- a/music-rest/pom.xml
+++ b/music-rest/pom.xml
@@ -213,13 +213,13 @@
                 <version>2.1.1.RELEASE</version>
                 <configuration>
                     <mainClass>org.onap.music.MusicApplication</mainClass>
                 <version>2.1.1.RELEASE</version>
                 <configuration>
                     <mainClass>org.onap.music.MusicApplication</mainClass>

-                    <outputDirectory>../distribution/music/</outputDirectory>
+                    <outputDirectory>${project.basedir}/distribution/music/</outputDirectory>

                     <addResources>true</addResources>
                     <finalName>MUSIC-SB</finalName>
                 </configuration>
                 <executions>
                     <execution>
                     <addResources>true</addResources>
                     <finalName>MUSIC-SB</finalName>
                 </configuration>
                 <executions>
                     <execution>

-                        <phase>install</phase>
+                        <phase>package</phase>

                         <goals>
                             <goal>repackage</goal>
                         </goals>
                         <goals>
                             <goal>repackage</goal>
                         </goals>


@@ -271,4 +271,97 @@
             </plugins>
         </pluginManagement>
     </build>
             </plugins>
         </pluginManagement>
     </build>

+    <profiles>
+        <profile>
+            <id>docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.19.1</version>
+                        <configuration>
+                            <verbose>true</verbose>
+                            <apiVersion>1.23</apiVersion>
+                            <registry>nexus3.onap.org:10003</registry>
+                            <images>
+                                <!-- MUSIC War -->
+                                <image>
+                                    <name>onap/music/music_sb</name>
+                                    <alias>docker_music</alias>
+                                    <build>
+                                        <cleanup>true</cleanup>
+                                        <tags>
+                                            <tag>${docker.tag}</tag>
+                                            <tag>${docker.latest.tag}</tag>
+                                        </tags>
+                                        <dockerFileDir>${project.basedir}/distribution/music</dockerFileDir>
+                                    </build>
+                                </image>
+                                <!-- Cassandra -->
+                                <image>
+                                    <name>onap/music/cassandra_3_11</name>
+                                    <alias>docker_cassandra_sec</alias>
+                                    <build>
+                                        <cleanup>true</cleanup>
+                                        <tags>
+                                            <tag>${docker.tag}</tag>
+                                            <tag>${docker.latest.tag}</tag>
+                                        </tags>
+                                        <dockerFileDir>${project.basedir}/distribution/cassandra</dockerFileDir>
+                                    </build>
+                                </image>
+                                <!-- Cassandra Job -->
+                                <image>
+                                    <name>onap/music/cassandra_job</name>
+                                    <alias>docker_cassandra_job</alias>
+                                    <build>
+                                        <cleanup>true</cleanup>
+                                        <tags>
+                                            <tag>${docker.tag}</tag>
+                                            <tag>${docker.latest.tag}</tag>
+                                        </tags>
+                                        <dockerFileDir>${project.basedir}/distribution/cassandra_job</dockerFileDir>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>clean-images</id>
+                                <phase>pre-clean</phase>
+                                <goals>
+                                    <goal>remove</goal>
+                                </goals>
+                                <configuration>
+                                    <removeAll>true</removeAll>
+                                    <image>music</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/music/music</image>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>default</id>
+        </profile>
+    </profiles>

 </project>
 </project>

diff --git a/pom.xml b/pom.xml
index 0f15cc3..51c12f9 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -116,99 +116,6 @@
         </plugins>
     </reporting>
 
         </plugins>
     </reporting>
 

-    <profiles>
-        <profile>
-            <id>docker</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.19.1</version>
-                        <configuration>
-                            <verbose>true</verbose>
-                            <apiVersion>1.23</apiVersion>
-                            <registry>nexus3.onap.org:10003</registry>
-                            <images>
-                                <!-- MUSIC War -->
-                                <image>
-                                    <name>onap/music/music_sb</name>
-                                    <alias>docker_music</alias>
-                                    <build>
-                                        <cleanup>true</cleanup>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
-                                        </tags>
-                                        <dockerFileDir>${project.basedir}/distribution/music</dockerFileDir>
-                                    </build>
-                                </image>
-                                <!-- Cassandra -->
-                                <image>
-                                    <name>onap/music/cassandra_3_11</name>
-                                    <alias>docker_cassandra_sec</alias>
-                                    <build>
-                                        <cleanup>true</cleanup>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
-                                        </tags>
-                                        <dockerFileDir>${project.basedir}/distribution/cassandra</dockerFileDir>
-                                    </build>
-                                </image>
-                                <!-- Cassandra Job -->
-                                <image>
-                                    <name>onap/music/cassandra_job</name>
-                                    <alias>docker_cassandra_job</alias>
-                                    <build>
-                                        <cleanup>true</cleanup>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
-                                        </tags>
-                                        <dockerFileDir>${project.basedir}/distribution/cassandra_job</dockerFileDir>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>clean-images</id>
-                                <phase>pre-clean</phase>
-                                <goals>
-                                    <goal>remove</goal>
-                                </goals>
-                                <configuration>
-                                    <removeAll>true</removeAll>
-                                    <image>music</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/music/music</image>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>default</id>
-        </profile>
-    </profiles>

     <distributionManagement>
         <repository>
             <id>ecomp-releases</id>
     <distributionManagement>
         <repository>
             <id>ecomp-releases</id>