diff options
Diffstat (limited to 'pomba')
| -rw-r--r-- | pomba/network-discovery/pom.xml | 25 | ||||
| -rw-r--r-- | pomba/network-discovery/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | pomba/network-discovery/src/main/docker/startService.sh | 4 | ||||
| -rw-r--r-- | pomba/service-decomposition/pom.xml | 24 | ||||
| -rw-r--r-- | pomba/service-decomposition/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | pomba/service-decomposition/src/main/docker/startService.sh | 4 |
6 files changed, 7 insertions, 54 deletions
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 @@ -140,29 +140,6 @@ limitations under the License. <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> <executions> @@ -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 @@ -143,29 +143,6 @@ limitations under the License. <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> <executions> @@ -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 |