Move to debian `apt` (was alpine `apk`)

[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 62feb8c..0279750 100755 (executable)
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -1,9 +1,21 @@
-FROM tomcat:9.0-jre8-alpine
+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 adduser --disabled-password onap onap
+RUN apt-get update && apt-get install -y \
+    curl \
+    vim \
+    net-tools \
+&& rm -rf /var/lib/apt/lists/*
+
+ARG user=onap
+ARG group=onap
+
+# 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
 
 # MariaDB variables
 ENV VID_MYSQL_HOST="vid-mariadb-docker-instance" \
@@ -82,14 +94,12 @@ 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} -Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/tmp"
-
 
 ADD maven/config/server.xml ${VID_TOMCAT_PATH}
 ADD maven/scripts/*.sh /tmp/vid/
 ADD maven/artifacts/vid.war /tmp/vid/stage/
 
-RUN chown onap:onap /tmp/vid /usr/local/tomcat -R
+RUN chown $user:$group /tmp/vid /usr/local/tomcat -R
 RUN chmod +x /tmp/vid/localize.sh
-USER onap
+USER $user
 CMD ["/tmp/vid/localize.sh"]