diff --git a/Dockerfile b/Dockerfile index aec568a9..3fb68d6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,6 @@ ARG EXTRA_CONFIG ENV JAR_NAME=${JAR_NAME} ENV JAR_VERSION=${JAR_VERSION} ENV IMAGE_VERSION=${IMAGE_VERSION} -ENV LOGBACK_CONF=${LOGBACK_CONF:-./conf/logback.xml} COPY ./target/${JAR_NAME}-${JAR_VERSION}-jar-with-dependencies.jar /app/${JAR_NAME}-${JAR_VERSION}.jar COPY ./target/${JAR_NAME}-${JAR_VERSION}-sources.jar /app @@ -25,6 +24,6 @@ USER uid2-admin CMD java \ -Djava.security.egd=file:/dev/./urandom \ -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory \ - -Dlogback.configurationFile=${LOGBACK_CONF} \ + -Dlogback.configurationFile=/app/conf/logback.xml \ -Xmx4g \ -jar ${JAR_NAME}-${JAR_VERSION}.jar diff --git a/conf/logback.loki.xml b/conf/logback.loki.xml deleted file mode 100644 index 1c49066a..00000000 --- a/conf/logback.loki.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - http://loki:3100/loki/api/v1/push - - - - - l=%level h=${HOSTNAME} po=${port_offset:-0} c=%logger{20} t=%thread | %msg %ex - - true - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/conf/logback.xml b/conf/logback.xml index a211e068..105339d7 100644 --- a/conf/logback.xml +++ b/conf/logback.xml @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index d6da7580..b3c294e2 100644 --- a/pom.xml +++ b/pom.xml @@ -94,11 +94,6 @@ logback-classic 1.5.8 - - com.github.loki4j - loki-logback-appender - 1.5.2 - org.junit.jupiter junit-jupiter