diff options
| author |   Wojciech Sliwka <wojciech.sliwka@nokia.com> | 2019-07-04 05:38:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-07-04 05:38:20 +0000 |
| commit | fc62274e8d15964d63c62bf0e2f4abc040252ee9 (patch) | |
| tree | ce8b9d3de8ce1ad4aa38f1f8cf8f4c8c07573749 /deliveries/src/main/docker/docker-files/Dockerfile | |
| parent | b460da47f0aebe67bed1234711b8bbf4889d1354 (diff) | |
| parent | 2625de9e904e1389a9d99e5cd90f9f462d0fec72 (diff) | |
Merge "Send logs to logstash"
Diffstat (limited to 'deliveries/src/main/docker/docker-files/Dockerfile')
| -rwxr-xr-x | deliveries/src/main/docker/docker-files/Dockerfile | 7 |
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"] |