moving certs from docker image to mounted catalog

[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 81ebd17..62feb8c 100755 (executable)
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -1,9 +1,9 @@
-FROM tomcat:8.0-jre8-alpine
+FROM tomcat:9.0-jre8-alpine
 
 # add vim and uncomment alias to speedup troubleshooting purpose
 RUN apk update && apk add openjdk8 vim net-tools
 
-COPY conf.d/ /etc/onap/vid/conf.d/
+RUN adduser --disabled-password onap onap
 
 # MariaDB variables
 ENV VID_MYSQL_HOST="vid-mariadb-docker-instance" \
@@ -26,7 +26,7 @@ ENV CACHE_DIRECTORY="$ROOT_DIR/cache"
 # Keystore variables
 ENV VID_KEYSTORE_FILENAME="${ROOT_DIR}/etc/org.onap.vid.jks" \
   VID_TRUSTSTORE_FILENAME="${ROOT_DIR}/etc/org.onap.vid.trust.jks" \
-  VID_KEYSTORE_PASSWORD="ry1RLC(?M6?2fQ]1a2)2y{P:" \
+  VID_KEYSTORE_PASSWORD="ry1RLC\(\?M6\?2fQ\]1a2\)2y\{P:" \
   VID_TRUSTSTORE_PASSWORD="OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2" \
   VID_TOMCAT_PATH="/usr/local/tomcat/conf/"
 
@@ -82,14 +82,14 @@ 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}"
+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/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 onap:onap /tmp/vid /usr/local/tomcat -R
 RUN chmod +x /tmp/vid/localize.sh
-
-CMD ["/tmp/vid/localize.sh"]
\ No newline at end of file
+USER onap
+CMD ["/tmp/vid/localize.sh"]