From f6df60ad420d9877ecd6f0338549848ab1a0e001 Mon Sep 17 00:00:00 2001 From: Mukesh Paliwal Date: Wed, 29 Sep 2021 17:53:29 +0530 Subject: Add logback-spring.xml and remove override.yaml from code Issue-ID: SO-3765 Signed-off-by: Mukesh Paliwal Change-Id: I001d0bea3341383d4da01d34b9ab31d7907f8b54 --- .../src/main/docker/docker-files/Dockerfile.so-bpmn-infra | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-bpmn-infra b/packages/docker/src/main/docker/docker-files/Dockerfile.so-bpmn-infra index e618ff15f5..aa4f776758 100644 --- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-bpmn-infra +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-bpmn-infra @@ -4,6 +4,7 @@ ARG user=so ARG group=so RUN echo "org.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource" >> /camunda/conf/catalina.properties +RUN echo $'JAVA_OPTS="$JAVA_OPTS -Dlogs_dir=logs/bpmn -Dspring.config.additional-location=$CATALINA_BASE/config/override.yaml -Dlogging.config=$CATALINA_BASE/logback-spring.xml"' >> /camunda/bin/setenv.sh RUN rm -r /camunda/webapps/examples /camunda/webapps/docs /camunda/webapps/camunda-invoice @@ -11,6 +12,12 @@ USER root COPY ca-certificates/onap-ca.crt /usr/local/share/ca-certificates/onap-ca.crt RUN update-ca-certificates --fresh +COPY configs/logging/logback-spring.xml /camunda +COPY maven/mso.war /camunda/webapps +COPY scripts/wait-for.sh /camunda +COPY scripts/bpmn-script/start-camunda-app.sh /camunda +COPY maven/mariadb-java-client.jar /camunda/lib + RUN addgroup $group && adduser --system --disabled-password --no-create-home --ingroup $group $user && \ chown -R $user:$group /camunda && \ chmod -R u+rw /camunda @@ -20,7 +27,5 @@ USER $user # Springboot configuration (required) VOLUME /camunda/app/config -COPY maven/mso.war /camunda/webapps -COPY scripts/wait-for.sh /camunda -COPY scripts/bpmn-script/start-camunda-app.sh /camunda -COPY maven/mariadb-java-client.jar /camunda/lib \ No newline at end of file +WORKDIR /camunda +ENTRYPOINT ["/camunda/start-camunda-app.sh"] \ No newline at end of file -- cgit 1.2.3-korg