diff --git a/chatmail_relay.dockerfile b/chatmail_relay.dockerfile index dd8b2bb..ea691c5 100644 --- a/chatmail_relay.dockerfile +++ b/chatmail_relay.dockerfile @@ -28,6 +28,10 @@ RUN rm -f /lib/systemd/system/multi-user.target.wants/* \ /lib/systemd/system/plymouth* \ /lib/systemd/system/systemd-update-utmp* +# Forward journald to console so `docker compose logs` works +RUN mkdir -p /etc/systemd/journald.conf.d \ + && printf '[Journal]\nForwardToConsole=yes\n' > /etc/systemd/journald.conf.d/95-docker-console.conf + VOLUME [ "/sys/fs/cgroup" ] # Main chatmail-relay image diff --git a/scripts/chatmail-init.sh b/scripts/chatmail-init.sh index 9b33578..4907e76 100755 --- a/scripts/chatmail-init.sh +++ b/scripts/chatmail-init.sh @@ -95,8 +95,3 @@ fi # Signal success to Docker healthcheck touch /run/chatmail-init.done - -# Forward journald to console so `docker compose logs` works -grep -q '^ForwardToConsole=yes' /etc/systemd/journald.conf \ - || echo "ForwardToConsole=yes" >> /etc/systemd/journald.conf -systemctl restart systemd-journald