Merge "Change template properties for AAI"

[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 33c3ac1..a115b5f 100755 (executable)
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -1,13 +1,14 @@
 FROM tomcat:8.0-jre8\r
+\r
 # add vim and uncomment alias to speedup troubleshooting purpose\r
 RUN apt-get update && apt-get install -y \\r
        openjdk-8-jdk vim net-tools\r
 \r
-RUN sed -i 's/# alias/alias/g' /root/.bashrc\r
+COPY conf.d/ /etc/onap/vid/conf.d/\r
 \r
-RUN mkdir -p ${ROOT_DIR}/etc\r
+RUN sed -i 's/# alias/alias/g' /root/.bashrc\r
 \r
-ENV JAVA_OPTS="-Xmx1536m -Xms1536m"\r
+ENV JAVA_OPTS="-Xmx1536m -Xms1536m -Dlogback.configurationFile=/etc/onap/vid/conf.d/logback.xml"\r
 \r
 ENV ROOT_DIR /opt/app/vid\r
 \r
@@ -86,4 +87,4 @@ ADD maven/artifacts/vid.war /tmp/vid/stage/
 \r
 RUN chmod +x /tmp/vid/localize.sh\r
 \r
-CMD ["/tmp/vid/localize.sh"]\r
+CMD ["/tmp/vid/localize.sh"]
\ No newline at end of file