summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Nelson <tn1381@att.com>2020-02-19 13:28:09 -0500
committerThomas Nelson <tn1381@att.com>2020-02-19 13:28:09 -0500
commita7512128b6eb91ac745dc6130a841910e31eb413 (patch)
tree31bc1bb768bf758c9accfc7351c9f7c92706ef6c
parent712f0dddc791f9ef8283fb40b5b5f326bc4ea0d9 (diff)
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
-rwxr-xr-xmusic-core/pom.xml101
-rw-r--r--music-rest/distribution/README.md (renamed from distribution/README.md)0
-rw-r--r--music-rest/distribution/cassandra/Dockerfile (renamed from distribution/cassandra/Dockerfile)0
-rw-r--r--music-rest/distribution/cassandra/cassandra.yaml (renamed from distribution/cassandra/cassandra.yaml)0
-rw-r--r--music-rest/distribution/cassandra/docker-entrypoint.sh (renamed from distribution/cassandra/docker-entrypoint.sh)0
-rw-r--r--music-rest/distribution/cassandra_job/Dockerfile (renamed from distribution/cassandra_job/Dockerfile)0
-rw-r--r--music-rest/distribution/cassandra_job/admin.cql (renamed from distribution/cassandra_job/admin.cql)0
-rw-r--r--music-rest/distribution/cassandra_job/admin_pw.cql (renamed from distribution/cassandra_job/admin_pw.cql)0
-rw-r--r--music-rest/distribution/cassandra_job/runcql.sh (renamed from distribution/cassandra_job/runcql.sh)0
-rw-r--r--music-rest/distribution/cassandra_job/test.cql (renamed from distribution/cassandra_job/test.cql)0
-rw-r--r--music-rest/distribution/music/Dockerfile (renamed from distribution/music/Dockerfile)0
-rw-r--r--music-rest/distribution/music/startup.sh (renamed from distribution/music/startup.sh)0
-rwxr-xr-xmusic-rest/pom.xml97
-rwxr-xr-xpom.xml93
14 files changed, 95 insertions, 196 deletions
diff --git a/music-core/pom.xml b/music-core/pom.xml
index ae50e643..687ec743 100755
--- a/music-core/pom.xml
+++ b/music-core/pom.xml
@@ -450,107 +450,6 @@
</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>
diff --git a/distribution/README.md b/music-rest/distribution/README.md
index 8b137891..8b137891 100644
--- a/distribution/README.md
+++ b/music-rest/distribution/README.md
diff --git a/distribution/cassandra/Dockerfile b/music-rest/distribution/cassandra/Dockerfile
index fe13322c..fe13322c 100644
--- a/distribution/cassandra/Dockerfile
+++ b/music-rest/distribution/cassandra/Dockerfile
diff --git a/distribution/cassandra/cassandra.yaml b/music-rest/distribution/cassandra/cassandra.yaml
index fa7c74a6..fa7c74a6 100644
--- a/distribution/cassandra/cassandra.yaml
+++ b/music-rest/distribution/cassandra/cassandra.yaml
diff --git a/distribution/cassandra/docker-entrypoint.sh b/music-rest/distribution/cassandra/docker-entrypoint.sh
index 34825bd2..34825bd2 100644
--- a/distribution/cassandra/docker-entrypoint.sh
+++ b/music-rest/distribution/cassandra/docker-entrypoint.sh
diff --git a/distribution/cassandra_job/Dockerfile b/music-rest/distribution/cassandra_job/Dockerfile
index 937afdee..937afdee 100644
--- a/distribution/cassandra_job/Dockerfile
+++ b/music-rest/distribution/cassandra_job/Dockerfile
diff --git a/distribution/cassandra_job/admin.cql b/music-rest/distribution/cassandra_job/admin.cql
index 904a2bab..904a2bab 100644
--- a/distribution/cassandra_job/admin.cql
+++ b/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
index bbad8d1d..bbad8d1d 100644
--- a/distribution/cassandra_job/admin_pw.cql
+++ b/music-rest/distribution/cassandra_job/admin_pw.cql
diff --git a/distribution/cassandra_job/runcql.sh b/music-rest/distribution/cassandra_job/runcql.sh
index 89396bfc..89396bfc 100644
--- a/distribution/cassandra_job/runcql.sh
+++ b/music-rest/distribution/cassandra_job/runcql.sh
diff --git a/distribution/cassandra_job/test.cql b/music-rest/distribution/cassandra_job/test.cql
index 196fea22..196fea22 100644
--- a/distribution/cassandra_job/test.cql
+++ b/music-rest/distribution/cassandra_job/test.cql
diff --git a/distribution/music/Dockerfile b/music-rest/distribution/music/Dockerfile
index 9868ceee..9868ceee 100644
--- a/distribution/music/Dockerfile
+++ b/music-rest/distribution/music/Dockerfile
diff --git a/distribution/music/startup.sh b/music-rest/distribution/music/startup.sh
index 2e1165d1..2e1165d1 100644
--- a/distribution/music/startup.sh
+++ b/music-rest/distribution/music/startup.sh
diff --git a/music-rest/pom.xml b/music-rest/pom.xml
index 6c611e88..f949ae5c 100755
--- 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>
- <outputDirectory>../distribution/music/</outputDirectory>
+ <outputDirectory>${project.basedir}/distribution/music/</outputDirectory>
<addResources>true</addResources>
<finalName>MUSIC-SB</finalName>
</configuration>
<executions>
<execution>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>repackage</goal>
</goals>
@@ -271,4 +271,97 @@
</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>
diff --git a/pom.xml b/pom.xml
index 0f15cc38..51c12f90 100755
--- a/pom.xml
+++ b/pom.xml
@@ -116,99 +116,6 @@
</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>