summaryrefslogtreecommitdiffstats
path: root/deliveries/src/main/docker/docker-files/Dockerfile
diff options
context:
space:
mode:
authorWojciech Sliwka <wojciech.sliwka@nokia.com>2019-06-07 15:53:08 +0200
committerWojciech Sliwka <wojciech.sliwka@nokia.com>2019-06-07 15:53:08 +0200
commit2625de9e904e1389a9d99e5cd90f9f462d0fec72 (patch)
treee1340e7090cc7a898bbc0af7afa9090bdc43b900 /deliveries/src/main/docker/docker-files/Dockerfile
parentdd3ba9800ec14898f50858ecd67db0f9245ffc01 (diff)
Send logs to logstash
Removing logback from vid container as it is not used at all Setting eelf variable to read configuration from /tmp/logback.xml -place which is mounted in oom /tmp/logback.xml has logpath set to /var/log/onap/ Change-Id: I8045e1d63f8f2b7574684f0758475555463fe8b1 Issue-ID: VID-485 Signed-off-by: Wojciech Sliwka <wojciech.sliwka@nokia.com>
Diffstat (limited to 'deliveries/src/main/docker/docker-files/Dockerfile')
-rwxr-xr-xdeliveries/src/main/docker/docker-files/Dockerfile7
1 files changed, 3 insertions, 4 deletions
diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index b169aa441..106b8a394 100755
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -4,8 +4,6 @@ FROM tomcat:9.0-jre8-alpine
RUN apk update && apk add openjdk8 vim net-tools
RUN adduser --disabled-password onap onap
-RUN mkdir -p /opt/app
-COPY conf.d/ /etc/onap/vid/conf.d/
# MariaDB variables
ENV VID_MYSQL_HOST="vid-mariadb-docker-instance" \
@@ -84,7 +82,8 @@ 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}
@@ -92,7 +91,7 @@ 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 /etc/onap/vid /opt/app -R
+RUN chown onap:onap /tmp/vid /usr/local/tomcat /opt/app -R
RUN chmod +x /tmp/vid/localize.sh
USER onap
CMD ["/tmp/vid/localize.sh"]