diff options
Diffstat (limited to 'packages/docker/src')
3 files changed, 12 insertions, 5 deletions
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 d507791852..53a82f3aaf 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 @@ -1,10 +1,12 @@ FROM camunda/camunda-bpm-platform:7.15.0 -ARG user=so -ARG group=so +ARG USER=so +ARG GROUP=so +ENV UID=1001 +ENV GID=1001 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=/camunda/logs/bpmn -Dspring.config.additional-location=$CATALINA_BASE/config/override.yaml -Dlogging.config=$CATALINA_BASE/logback-spring.xml"' >> /camunda/bin/setenv.sh +RUN echo $'JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=${ACTIVE_PROFILE} -Dlogs_dir=/camunda/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 @@ -12,7 +14,7 @@ USER root COPY ca-certificates/onap-ca.crt /usr/local/share/ca-certificates/onap-ca.crt RUN update-ca-certificates --fresh -RUN addgroup $group && adduser --system --disabled-password --no-create-home --ingroup $group $user +RUN addgroup --gid $GID $GROUP && adduser --disabled-password --gecos "" --no-create-home --ingroup $GROUP --uid $UID $USER COPY configs/logging/logback-spring.xml /camunda COPY maven/mso.war /camunda/webapps @@ -21,7 +23,7 @@ COPY scripts/bpmn-script/start-camunda-app.sh /camunda COPY maven/mariadb-java-client.jar /camunda/lib COPY maven/HikariCP.jar /camunda/lib -RUN chown -R $user:$group /camunda +RUN chown -R $USER:$GROUP /camunda RUN chmod -R u+rw /camunda RUN chmod +x /camunda/start-camunda-app.sh diff --git a/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml b/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml index e4be7094df..06bfa4a90c 100644 --- a/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml +++ b/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml @@ -183,6 +183,7 @@ <logger name="org.apache.cxf.interceptor" level="DEBUG" /> <logger name="com.att.commons" level="DEBUG" /> <logger name="org.reflections" level="ERROR" /> + <logger name="org.springframework.boot.actuate" level="DEBUG" /> <logger name="AUDIT" level="INFO" additivity="false"> <appender-ref ref="asyncAudit" /> diff --git a/packages/docker/src/main/docker/docker-files/scripts/bpmn-script/start-camunda-app.sh b/packages/docker/src/main/docker/docker-files/scripts/bpmn-script/start-camunda-app.sh index 4797a300fa..ca6d193b08 100755 --- a/packages/docker/src/main/docker/docker-files/scripts/bpmn-script/start-camunda-app.sh +++ b/packages/docker/src/main/docker/docker-files/scripts/bpmn-script/start-camunda-app.sh @@ -27,5 +27,9 @@ if [ -n "${AAF_SSL_CERTS_ENABLED}" ]; then read_properties "$(head -n 4 /camunda/app/certs/.passphrases)" fi +if [ -z "${ACTIVE_PROFILE}" ]; then + export ACTIVE_PROFILE="basic" +fi + # Running camunda.sh /bin/bash "/camunda/camunda.sh"
\ No newline at end of file |