summaryrefslogtreecommitdiffstats
path: root/mod/runtimeapi/runtime-web
diff options
context:
space:
mode:
authorAndrew Gauld <agauld@att.com>2020-01-21 14:47:38 +0000
committerAndrew Gauld <agauld@att.com>2020-01-21 19:41:32 +0000
commit3fb91dc34bcde5489681f6470cae7f01c8b246d0 (patch)
tree8c6a330a1dc1084c8ff99ee4e418838fe9ecfbd8 /mod/runtimeapi/runtime-web
parent86a040e87585d176dee6f215d5d46a2a74c1366e (diff)
runtimeapi & genprocessor pom.xml docker changes
Change-Id: I1595bf1c08dae161530c4dcdbc3e53b909164a10 Issue-ID: DCAEGEN2-1860 Signed-off-by: Andrew Gauld <agauld@att.com>
Diffstat (limited to 'mod/runtimeapi/runtime-web')
-rw-r--r--mod/runtimeapi/runtime-web/Dockerfile10
-rw-r--r--mod/runtimeapi/runtime-web/pom.xml31
2 files changed, 28 insertions, 13 deletions
diff --git a/mod/runtimeapi/runtime-web/Dockerfile b/mod/runtimeapi/runtime-web/Dockerfile
deleted file mode 100644
index 5d17d41..0000000
--- a/mod/runtimeapi/runtime-web/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM openjdk:8-jre-alpine
-WORKDIR /usr/app
-VOLUME /tmp
-ADD target/runtime-web-1.0.0.jar runtime-web-1.0.0.jar
-
-EXPOSE 9090
-
-ENTRYPOINT ["java", \
- "-Djava.security.egd=file:/dev/./urandom", \
- "-jar", "runtime-web-1.0.0.jar"]
diff --git a/mod/runtimeapi/runtime-web/pom.xml b/mod/runtimeapi/runtime-web/pom.xml
index 27cc960..3b39845 100644
--- a/mod/runtimeapi/runtime-web/pom.xml
+++ b/mod/runtimeapi/runtime-web/pom.xml
@@ -66,25 +66,50 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<verbose>true</verbose>
- <imagePullPolicy>IfNotPresent</imagePullPolicy>
+ <pullRegistry>${docker.pull.registry}</pullRegistry>
+ <pushRegistry>${docker.push.registry}</pushRegistry>
<images>
<image>
<name>onap/${project.groupId}.${project.artifactId}</name>
<registry>${onap.nexus.dockerregistry.daily}</registry>
<build>
- <contextDir>${project.basedir}</contextDir>
- <cleanup>none</cleanup>
+ <from>openjdk:8-jre-alpine</from>
<tags>
<tag>latest</tag>
<tag>${project.version}</tag>
<tag>${project.version}-${maven.build.timestamp}Z</tag>
</tags>
+ <assembly>
+ <descriptorRef>artifact</descriptorRef>
+ </assembly>
+ <workdir>/maven</workdir>
+ <volumes>
+ <volume>/tmp</volume>
+ </volumes>
+ <ports>
+ <port>9090</port>
+ </ports>
+ <entryPoint>
+ <exec>
+ <arg>java</arg>
+ <arg>-Djava.security.egd=file:/dev/./urandom</arg>
+ <arg>-jar</arg>
+ <arg>${project.artifactId}-${project.version}.${project.packaging}</arg>
+ </exec>
+ </entryPoint>
</build>
</image>
</images>