Change openjdk baseOS img to integration-java11

[dcaegen2/analytics/tca-gen2.git] / dcae-analytics / dcae-analytics-tca-web / Dockerfile

diff --git a/dcae-analytics/dcae-analytics-tca-web/Dockerfile b/dcae-analytics/dcae-analytics-tca-web/Dockerfile
index 411b6b1..2791e03 100644 (file)
--- a/dcae-analytics/dcae-analytics-tca-web/Dockerfile
+++ b/dcae-analytics/dcae-analytics-tca-web/Dockerfile
@@ -1,9 +1,4 @@
-# NOTE: This Dockerfile is auto generated and filtered via maven resources plugin.
-# Edits to generated Dockerfile will NOT be saved.
-# Only changes made in docker/Dockerfile template file will be persistent
-# ==========================================================================
-
-FROM openjdk:11-jre-slim
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
 MAINTAINER Rajiv Singla <rs153v@att.com>
 
@@ -11,22 +6,26 @@ ARG PROJECT_BUILD_DIR_NAME
 ARG FINAL_JAR
 ARG DEPENDENCIES_DIR
 ARG DOCKER_ARTIFACT_DIR
+ARG user=tca-gen2
+ARG group=tca-gen2
 
-RUN mkdir -p /var/log/ONAP/dcaegen2/analytics/tca-gen2
-#Add a new user and group to allow container to be run as non-root
-RUN groupadd tca-gen2 && useradd -g tca-gen2 tca-gen2; \
-    chmod a+rwx /opt; \
-    chmod a+rwx /var/log/ONAP/dcaegen2/analytics/tca-gen2; \
-    chown -R tca-gen2:tca-gen2 /opt; \
-    chown -R tca-gen2:tca-gen2 /var/log/ONAP/dcaegen2/analytics/tca-gen2
-
-#Copy dependencies and executable jar
 WORKDIR ${DOCKER_ARTIFACT_DIR}
+#Copy dependencies and executable jar
 COPY ${PROJECT_BUILD_DIR_NAME}/${FINAL_JAR} .
-#Overcome Docker limitation to put ARG inside ENTRYPOINT
-RUN ln -s ${FINAL_JAR} tca-gen2.jar
+
+USER root
+
+#Symlink to overcome Docker limitation to put ARG inside ENTRYPOINT
+RUN mkdir -p /var/log/ONAP/dcaegen2/analytics/tca-gen2 && \
+    addgroup $group && adduser --system --disabled-password --no-create-home --ingroup $group $user && \
+    chmod g+rwx /opt; \
+    chmod u+rw /var/log/ONAP/dcaegen2/analytics/tca-gen2 && \
+    chown -R $user /opt && \
+    chown -R $user /var/log/ONAP/dcaegen2/analytics/tca-gen2 && \
+    ln -s ${FINAL_JAR} tca-gen2.jar && \
+    chown $user ${FINAL_JAR} tca-gen2.jar
 
 EXPOSE 8100
 
-USER tca-gen2:tca-gen2
+USER $user
 ENTRYPOINT ["java", "-Dspring.profiles.active=configBindingService,dmaap,mongo", "-jar", "tca-gen2.jar"]