[pnf-simulator] use slighly smaller base image

- openjdk:11-jre-slim (220MB) -> eclipse-temurin:11-jre-alpine (60MB)

Issue-ID: INT-2312
Change-Id: I4cad7237d9e55d193ee57ef8ee2efb288257986c
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/httpserver/pom.xml b/httpserver/pom.xml
index c8fabba..4b6da3b 100644 (file)
--- a/httpserver/pom.xml
+++ b/httpserver/pom.xml
@@ -82,7 +82,7 @@
                             <images>
                                 <image>
                                     <alias>${project.artifactId}</alias>
-                                    <name>${docker-image.namespace}/${docker-image.name.prefix}.${artifactId}</name>
+                                    <name>${docker-image.namespace}/${docker-image.name.prefix}.${project.artifactId}</name>
                                     <registry>${onap.nexus.dockerregistry.daily}</registry>
                                     <build>
                                         <dockerFileDir>${project.basedir}</dockerFileDir>

diff --git a/netconfsimulator/pom.xml b/netconfsimulator/pom.xml
index 2f06d9e..e341b9a 100644 (file)
--- a/netconfsimulator/pom.xml
+++ b/netconfsimulator/pom.xml
@@ -274,7 +274,7 @@
                             <images>
                                 <image>
                                     <alias>${project.artifactId}</alias>
-                                    <name>${docker-image.namespace}/${docker-image.name.prefix}.${artifactId}</name>
+                                    <name>${docker-image.namespace}/${docker-image.name.prefix}.${project.artifactId}</name>
                                     <registry>${onap.nexus.dockerregistry.daily}</registry>
                                     <build>
                                         <contextDir>${project.basedir}</contextDir>

diff --git a/pnfsimulator/Dockerfile b/pnfsimulator/Dockerfile
index 2cd3d9d..105e55e 100644 (file)
--- a/pnfsimulator/Dockerfile
+++ b/pnfsimulator/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/openjdk:11-jre-slim
+FROM eclipse-temurin:11-jre-alpine
 COPY --from=python:3.6 / /
 
 ARG VERSION=${version}
@@ -8,8 +8,7 @@ ADD config /opt/db/config
 ADD ./templates /app/templates
 ADD ./src/main/resources/application.properties /app/application.properties
 ADD target/pnfsimulator-${VERSION}.jar /app/pnf-simulator.jar
-CMD apk update
-CMD apk add ca-certificates
+
 RUN python -m pip install -r /opt/db/config/requirements.txt
 ADD certificates  /usr/local/share/ca-certificates/
 RUN update-ca-certificates

diff --git a/pnfsimulator/pom.xml b/pnfsimulator/pom.xml
index 701254c..3b4e037 100644 (file)
--- a/pnfsimulator/pom.xml
+++ b/pnfsimulator/pom.xml
@@ -360,7 +360,7 @@
                             <images>
                                 <image>
                                     <alias>${project.artifactId}</alias>
-                                    <name>${docker-image.namespace}/${docker-image.name.prefix}.${artifactId}</name>
+                                    <name>${docker-image.namespace}/${docker-image.name.prefix}.${project.artifactId}</name>
                                     <registry>${onap.nexus.dockerregistry.daily}</registry>
                                     <build>
                                         <dockerFileDir>${project.basedir}</dockerFileDir>