Fix for VID-890

[vid.git] / deliveries / src / main / docker / docker-files / Dockerfile

diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index b169aa4..192fcd2 100755 (executable)
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -1,11 +1,35 @@
-FROM tomcat:9.0-jre8-alpine
+FROM openjdk:11-jdk-slim as build
+
+ADD maven/artifacts/vid.war /stage/
+WORKDIR /vid
+RUN jar -xf /stage/vid.war
+RUN rm -f *.war
+
+FROM tomcat:9-jdk11-openjdk-slim
 
 # add vim and uncomment alias to speedup troubleshooting purpose
-RUN apk update && apk add openjdk8 vim net-tools
+RUN apt-get update && apt-get install -y \
+    curl \
+    vim \
+    net-tools \
+&& rm -rf /var/lib/apt/lists/*
+
+ARG user=onap
+ARG group=onap
 
-RUN adduser --disabled-password onap onap
-RUN mkdir -p /opt/app
-COPY conf.d/ /etc/onap/vid/conf.d/
+# Create a group and user
+RUN groupadd -r $group && useradd -ms /bin/bash $user -g $group && \
+    mkdir /opt/$user && \
+    chown -R $user:$group /opt/$user &&  \
+    mkdir /var/log/$user && \
+    chown -R $user:$group /var/log/$user
+
+#install procps
+RUN apt-get update && apt-get install -y procps
+
+# Kubernetes variables
+# set to TRUE (in capital) if on Kubernetes
+ENV ON_KUBERNETES="FALSE"
 
 # MariaDB variables
 ENV VID_MYSQL_HOST="vid-mariadb-docker-instance" \
@@ -84,15 +108,13 @@ ENV VID_CONTACT_US_LINK="https://todo_contact_us_link.com" \
 
 # Custom options
 ENV JAVA_OPTS="-Xmx1536m -Xms1536m"
-ENV CATALINA_OPTS="-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME}"
 
-ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME}
-ADD maven/config/org.onap.vid.trust.jks ${VID_TRUSTSTORE_FILENAME}
 ADD maven/config/server.xml ${VID_TOMCAT_PATH}
 ADD maven/scripts/*.sh /tmp/vid/
-ADD maven/artifacts/vid.war /tmp/vid/stage/
+RUN chown $user:$group /tmp/vid /usr/local/tomcat -R
+
+COPY --chown=$user:$group --from=build /vid /usr/local/tomcat/webapps/vid/
 
-RUN chown onap:onap /tmp/vid /usr/local/tomcat /etc/onap/vid /opt/app -R
-RUN chmod +x /tmp/vid/localize.sh
-USER onap
-CMD ["/tmp/vid/localize.sh"]
+RUN chmod +x /tmp/vid/start.sh
+USER $user
+CMD ["/tmp/vid/start.sh"]