From 27e8724988e5c31d2b56bf2a3f889415f2299c40 Mon Sep 17 00:00:00 2001
From: Mohammadreza Pasandideh <mohammadreza.pasandideh@amdocs.com>
Date: Fri, 17 Aug 2018 13:56:11 -0400
Subject: Docker file: networkDiscovery serviceDecomposition

Issue-ID: LOG-397 SDNC-317

Change-Id: I0844eb12c8cd3b208f6a15cc16dd8717175bd5d8
Signed-off-by: Mohammadreza Pasandideh <mohammadreza.pasandideh@amdocs.com>
---
 pomba/network-discovery/pom.xml                    | 25 +---------------------
 pomba/network-discovery/src/main/docker/Dockerfile |  2 +-
 .../src/main/docker/startService.sh                |  4 ++--
 pomba/service-decomposition/pom.xml                | 24 ---------------------
 .../src/main/docker/Dockerfile                     |  2 +-
 .../src/main/docker/startService.sh                |  4 ++--
 6 files changed, 7 insertions(+), 54 deletions(-)

(limited to 'pomba')

diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml
index 8f0d725..597b5c8 100644
--- a/pomba/network-discovery/pom.xml
+++ b/pomba/network-discovery/pom.xml
@@ -139,29 +139,6 @@ limitations under the License.
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <!-- here the phase you need -->
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${swagger.directory}</directory>
-                                    <targetPath>META-INF/resources/swagger</targetPath>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -174,7 +151,7 @@ limitations under the License.
                 </executions>
             </plugin>
         </plugins>
-        <!-- mention the logback.xml location through system property or environment variable to edit logback.xml at run time -->
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
diff --git a/pomba/network-discovery/src/main/docker/Dockerfile b/pomba/network-discovery/src/main/docker/Dockerfile
index a7f5782..b378a89 100644
--- a/pomba/network-discovery/src/main/docker/Dockerfile
+++ b/pomba/network-discovery/src/main/docker/Dockerfile
@@ -9,7 +9,7 @@ RUN mkdir -p $MICROSERVICE_HOME/config/auth/
 RUN mkdir -p $MICROSERVICE_HOME/lib/
 RUN mkdir -p $MICROSERVICE_HOME/bin/
 
-ADD pomba-network-discovery.jar $MICROSERVICE_HOME/lib/
+ADD network-discovery.jar $MICROSERVICE_HOME/lib/
 ADD startService.sh $MICROSERVICE_HOME/bin/
 COPY config/ $MICROSERVICE_HOME/config/
 COPY config/auth/ $MICROSERVICE_HOME/config/auth/
diff --git a/pomba/network-discovery/src/main/docker/startService.sh b/pomba/network-discovery/src/main/docker/startService.sh
index 2169c4d..f3c80db 100644
--- a/pomba/network-discovery/src/main/docker/startService.sh
+++ b/pomba/network-discovery/src/main/docker/startService.sh
@@ -2,7 +2,7 @@
 
 cd /opt/app
 if [ -z "${java_runtime_arguments}" ]; then
-    java -Dlogging.config=config/logback.xml -Xms128m -Xmx512m -jar /opt/app/lib/pomba-network-discovery.jar
+    java -Dlogging.config=config/logback.xml -Xms128m -Xmx512m -jar /opt/app/lib/network-discovery.jar
 else
-    java -Dlogging.config=config/logback.xml $java_runtime_arguments -jar /opt/app/lib/pomba-network-discovery.jar
+    java -Dlogging.config=config/logback.xml $java_runtime_arguments -jar /opt/app/lib/network-discovery.jar
 fi
\ No newline at end of file
diff --git a/pomba/service-decomposition/pom.xml b/pomba/service-decomposition/pom.xml
index 39ebf3d..274a56d 100644
--- a/pomba/service-decomposition/pom.xml
+++ b/pomba/service-decomposition/pom.xml
@@ -142,29 +142,6 @@ limitations under the License.
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <!-- here the phase you need -->
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${swagger.directory}</directory>
-                                    <targetPath>META-INF/resources/swagger</targetPath>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -177,7 +154,6 @@ limitations under the License.
                 </executions>
             </plugin>
         </plugins>
-        <!-- mention the logback.xml location through system property or environment variable to edit logback.xml at run time -->
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
diff --git a/pomba/service-decomposition/src/main/docker/Dockerfile b/pomba/service-decomposition/src/main/docker/Dockerfile
index 55a7b68..0c336a8 100644
--- a/pomba/service-decomposition/src/main/docker/Dockerfile
+++ b/pomba/service-decomposition/src/main/docker/Dockerfile
@@ -8,7 +8,7 @@ RUN mkdir -p $MICROSERVICE_HOME/config/
 RUN mkdir -p $MICROSERVICE_HOME/lib/
 RUN mkdir -p $MICROSERVICE_HOME/bin/
 
-ADD pomba-service-decomposition.jar $MICROSERVICE_HOME/lib/
+ADD service-decomposition.jar $MICROSERVICE_HOME/lib/
 ADD startService.sh $MICROSERVICE_HOME/bin/
 COPY config/ $MICROSERVICE_HOME/config/
 
diff --git a/pomba/service-decomposition/src/main/docker/startService.sh b/pomba/service-decomposition/src/main/docker/startService.sh
index 5efbe79..b455e67 100644
--- a/pomba/service-decomposition/src/main/docker/startService.sh
+++ b/pomba/service-decomposition/src/main/docker/startService.sh
@@ -2,7 +2,7 @@
 
 cd /opt/app
 if [ -z "${java_runtime_arguments}" ]; then
-    java -Dlogging.config=config/logback.xml -Xms128m -Xmx512m -jar /opt/app/lib/pomba-service-decomposition.jar
+    java -Dlogging.config=config/logback.xml -Xms128m -Xmx512m -jar /opt/app/lib/service-decomposition.jar
 else
-    java -Dlogging.config=config/logback.xml $java_runtime_arguments -jar /opt/app/lib/pomba-service-decomposition.jar
+    java -Dlogging.config=config/logback.xml $java_runtime_arguments -jar /opt/app/lib/service-decomposition.jar
 fi
\ No newline at end of file
-- 
cgit 1.2.3-korg