Merge "Changed so that registration never gives up"

diff --git a/datafilecollector/Dockerfile b/datafilecollector/Dockerfile
index cee8d75..784550f 100755 (executable)
--- a/datafilecollector/Dockerfile
+++ b/datafilecollector/Dockerfile
@@ -19,7 +19,25 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #
-FROM openjdk:17-jdk-slim
+FROM openjdk:17-jdk as jre-build
+
+RUN $JAVA_HOME/bin/jlink \
+--verbose \
+--add-modules ALL-MODULE-PATH \
+--strip-debug \
+--no-man-pages \
+--no-header-files \
+--compress=2 \
+--output /customjre
+
+# Use debian base image (same as openjdk uses)
+FROM debian:11-slim
+
+ENV JAVA_HOME=/jre
+ENV PATH="${JAVA_HOME}/bin:${PATH}"
+
+#copy JRE from the base image
+COPY --from=jre-build /customjre $JAVA_HOME
 
 EXPOSE 8100 8433
 
@@ -48,4 +66,4 @@ RUN mkdir -p /var/log/ONAP /opt/app/datafile/etc/cert/ && \
 USER $user
 
 COPY --chown=$user:$group /target/datafile-app-server.jar /opt/app/datafile/
-ENTRYPOINT ["java", "-jar", "/opt/app/datafile/datafile-app-server.jar"]
+CMD ["/jre/bin/java", "-jar", "/opt/app/datafile/datafile-app-server.jar"]

diff --git a/influxlogger/Dockerfile b/influxlogger/Dockerfile
index c1d6be5..fea4ba5 100644 (file)
--- a/influxlogger/Dockerfile
+++ b/influxlogger/Dockerfile
@@ -20,7 +20,25 @@
 # ============LICENSE_END=========================================================
 
 
-FROM openjdk:17-jdk-slim
+FROM openjdk:17-jdk as jre-build
+
+RUN $JAVA_HOME/bin/jlink \
+--verbose \
+--add-modules ALL-MODULE-PATH \
+--strip-debug \
+--no-man-pages \
+--no-header-files \
+--compress=2 \
+--output /customjre
+
+# Use debian base image (same as openjdk uses)
+FROM debian:11-slim
+
+ENV JAVA_HOME=/jre
+ENV PATH="${JAVA_HOME}/bin:${PATH}"
+
+#copy JRE from the base image
+COPY --from=jre-build /customjre $JAVA_HOME
 
 EXPOSE 8084 8435
 
@@ -48,4 +66,4 @@ RUN chown -R $user:$group /var/pmlog-service
 USER ${user}
 
 ADD target/${JAR} /opt/app/pmlog-service/pmlog.jar
-CMD ["java", "-jar", "/opt/app/pmlog-service/pmlog.jar"]
+CMD ["/jre/bin/java", "-jar", "/opt/app/pmlog-service/pmlog.jar"]

diff --git a/pmproducer/Dockerfile b/pmproducer/Dockerfile
index 0eebe91..5b621af 100644 (file)
--- a/pmproducer/Dockerfile
+++ b/pmproducer/Dockerfile
@@ -20,7 +20,25 @@
 # ============LICENSE_END=========================================================
 
 
-FROM openjdk:17-jdk-slim
+FROM openjdk:17-jdk as jre-build
+
+RUN $JAVA_HOME/bin/jlink \
+--verbose \
+--add-modules ALL-MODULE-PATH \
+--strip-debug \
+--no-man-pages \
+--no-header-files \
+--compress=2 \
+--output /customjre
+
+# Use debian base image (same as openjdk uses)
+FROM debian:11-slim
+
+ENV JAVA_HOME=/jre
+ENV PATH="${JAVA_HOME}/bin:${PATH}"
+
+#copy JRE from the base image
+COPY --from=jre-build /customjre $JAVA_HOME
 
 EXPOSE 8084 8435
 
@@ -48,4 +66,4 @@ RUN chown -R $user:$group /var/pm-producer-service
 USER ${user}
 
 ADD target/${JAR} /opt/app/pm-producer-service/pmproducer.jar
-CMD ["java", "-jar", "/opt/app/pm-producer-service/pmproducer.jar"]
+CMD ["/jre/bin/java", "-jar", "/opt/app/pm-producer-service/pmproducer.jar"]