From cd061c8039d615f6584eab522c19b407317ba031 Mon Sep 17 00:00:00 2001 From: Ken Huang Date: Fri, 10 Jan 2025 22:58:39 +0800 Subject: [PATCH] KAFKA-18340: Change Dockerfile to use log4j2 yaml instead log4j properties (#18378) Reviewers: Mickael Maison --- docker/jvm/Dockerfile | 4 ++-- docker/native/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/jvm/Dockerfile b/docker/jvm/Dockerfile index 79687d0e225..767b414ab7a 100644 --- a/docker/jvm/Dockerfile +++ b/docker/jvm/Dockerfile @@ -76,8 +76,8 @@ RUN set -eux ; \ chown appuser:appuser -R /usr/logs /opt/kafka /mnt/shared/config; \ chown appuser:root -R /var/lib/kafka /etc/kafka/secrets /etc/kafka; \ chmod -R ug+w /etc/kafka /var/lib/kafka /etc/kafka/secrets; \ - cp /opt/kafka/config/log4j.properties /etc/kafka/docker/log4j.properties; \ - cp /opt/kafka/config/tools-log4j.properties /etc/kafka/docker/tools-log4j.properties; \ + cp /opt/kafka/config/log4j2.yaml /etc/kafka/docker/log4j2.yaml; \ + cp /opt/kafka/config/tools-log4j2.yaml /etc/kafka/docker/tools-log4j2.yaml; \ cp /opt/kafka/config/kraft/reconfig-server.properties /etc/kafka/docker/server.properties; \ rm kafka.tgz kafka.tgz.asc KEYS; \ apk del wget gpg gpg-agent; \ diff --git a/docker/native/Dockerfile b/docker/native/Dockerfile index ed3171137c3..57c11ba7048 100644 --- a/docker/native/Dockerfile +++ b/docker/native/Dockerfile @@ -64,8 +64,8 @@ RUN apk update ; \ COPY --chown=appuser:root --from=build-native-image /app/kafka/kafka.Kafka /opt/kafka/ COPY --chown=appuser:root --from=build-native-image /app/kafka/config/kraft/reconfig-server.properties /etc/kafka/docker/ -COPY --chown=appuser:root --from=build-native-image /app/kafka/config/log4j.properties /etc/kafka/docker/ -COPY --chown=appuser:root --from=build-native-image /app/kafka/config/tools-log4j.properties /etc/kafka/docker/ +COPY --chown=appuser:root --from=build-native-image /app/kafka/config/log4j2.yaml /etc/kafka/docker/ +COPY --chown=appuser:root --from=build-native-image /app/kafka/config/tools-log4j2.yaml /etc/kafka/docker/ COPY --chown=appuser:root resources/common-scripts /etc/kafka/docker/ COPY --chown=appuser:root launch /etc/kafka/docker/