From e3a66629c3603687fd99abb5043e2df9d9e5e9bf Mon Sep 17 00:00:00 2001 From: Val Date: Sun, 26 Jul 2015 19:48:23 +0100 Subject: [PATCH] Replace rsyslog with redirection to std(out|err) --- amavis/Dockerfile | 9 ++++++++- email_core/Dockerfile | 8 +++++++- opendkim/Dockerfile | 11 ++++++++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/amavis/Dockerfile b/amavis/Dockerfile index 92090b4..fb2745f 100644 --- a/amavis/Dockerfile +++ b/amavis/Dockerfile @@ -31,6 +31,13 @@ RUN chmod 755 /boot ENV AMAVIS=true +# Redirect logs for Docker to pickup +RUN ln -sf /dev/stdout /var/log/razor-agent.log +RUN ln -sf /dev/stdout /var/log/mail.log +RUN ln -sf /dev/stdout /var/log/mail.info +RUN ln -sf /dev/stdout /var/log/mail.warn +RUN ln -sf /dev/stderr /var/log/mail.err + EXPOSE 10024 -ENTRYPOINT ./boot; service rsyslog start; amavisd-new foreground +ENTRYPOINT ./boot; amavisd-new foreground diff --git a/email_core/Dockerfile b/email_core/Dockerfile index 339e966..bbcf4c5 100644 --- a/email_core/Dockerfile +++ b/email_core/Dockerfile @@ -43,5 +43,11 @@ VOLUME ["/vmail"] RUN groupadd -g 5000 vmail RUN useradd -g vmail -u 5000 vmail -d /vmail -m +# Redirect logs for Docker to pickup +RUN ln -sf /dev/stdout /var/log/mail.log +RUN ln -sf /dev/stdout /var/log/mail.info +RUN ln -sf /dev/stdout /var/log/mail.warn +RUN ln -sf /dev/stderr /var/log/mail.err + EXPOSE 25 143 587 -ENTRYPOINT /boot; service rsyslog start; service postfix start; dovecot -F +ENTRYPOINT /boot; service postfix start; dovecot -F diff --git a/opendkim/Dockerfile b/opendkim/Dockerfile index 213533e..91bc9b8 100644 --- a/opendkim/Dockerfile +++ b/opendkim/Dockerfile @@ -5,8 +5,7 @@ RUN locale-gen en_GB en_GB.UTF-8 && dpkg-reconfigure locales # Prerequisites RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ - apt-get update && apt-get install -y \ - opendkim && \ + apt-get update && apt-get install -y opendkim && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -19,6 +18,12 @@ RUN chmod 755 /boot ENV OPEN_DKIM=true +# Redirect logs for Docker to pickup +RUN ln -sf /dev/stdout /var/log/mail.log +RUN ln -sf /dev/stdout /var/log/mail.info +RUN ln -sf /dev/stdout /var/log/mail.warn +RUN ln -sf /dev/stderr /var/log/mail.err + EXPOSE 8891 -ENTRYPOINT /boot; service rsyslog start; opendkim -f -p inet:8891@0.0.0.0 +ENTRYPOINT /boot; opendkim -f -p inet:8891@0.0.0.0