From 9bfb566f5e774d6f5592377a4be38edc1ba29a22 Mon Sep 17 00:00:00 2001 From: ywk253100 Date: Wed, 24 Feb 2016 10:30:13 +0800 Subject: [PATCH 1/2] Update Dockerfile --- Deploy/log/Dockerfile | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/Deploy/log/Dockerfile b/Deploy/log/Dockerfile index b7aaa2fc8..8d998367f 100644 --- a/Deploy/log/Dockerfile +++ b/Deploy/log/Dockerfile @@ -1,23 +1,19 @@ FROM library/ubuntu:14.04 -# run logrotate hourly -RUN mv /etc/cron.daily/logrotate /etc/cron.hourly/ + +# run logrotate hourly, disable imklog model, provides TCP/UDP syslog reception +RUN mv /etc/cron.daily/logrotate /etc/cron.hourly/ \ + && sed 's/$ModLoad imklog/#$ModLoad imklog/' -i /etc/rsyslog.conf \ + && sed 's/$KLogPermitNonKernelFacility on/#$KLogPermitNonKernelFacility on/' -i /etc/rsyslog.conf \ + && sed 's/#$ModLoad imudp/$ModLoad imudp/' -i /etc/rsyslog.conf \ + && sed 's/#$UDPServerRun 514/$UDPServerRun 514/' -i /etc/rsyslog.conf \ + && sed 's/#$ModLoad imtcp/$ModLoad imtcp/' -i /etc/rsyslog.conf \ + && sed 's/#$InputTCPServerRun 514/$InputTCPServerRun 514/' -i /etc/rsyslog.conf \ + && rm /etc/rsyslog.d/* # logrotate configuration file for docker ADD logrotate_docker.conf /etc/logrotate.d/ -#disable imklog model -RUN sed 's/$ModLoad imklog/#$ModLoad imklog/' -i /etc/rsyslog.conf -RUN sed 's/$KLogPermitNonKernelFacility on/#$KLogPermitNonKernelFacility on/' -i /etc/rsyslog.conf - -# provides TCP/UDP syslog reception -RUN sed 's/#$ModLoad imudp/$ModLoad imudp/' -i /etc/rsyslog.conf -RUN sed 's/#$UDPServerRun 514/$UDPServerRun 514/' -i /etc/rsyslog.conf -RUN sed 's/#$ModLoad imtcp/$ModLoad imtcp/' -i /etc/rsyslog.conf -RUN sed 's/#$InputTCPServerRun 514/$InputTCPServerRun 514/' -i /etc/rsyslog.conf - -RUN rm /etc/rsyslog.d/* - # rsyslog configuration file for docker ADD rsyslog_docker.conf /etc/rsyslog.d/ @@ -26,3 +22,4 @@ VOLUME /var/log/docker/ EXPOSE 514 CMD cron && chown -R syslog:syslog /var/log/docker/ && rsyslogd -n + From e58c137912f6575c2d12d45afec900b6e1764c80 Mon Sep 17 00:00:00 2001 From: ywk253100 Date: Wed, 24 Feb 2016 10:30:33 +0800 Subject: [PATCH 2/2] Update Dockerfile --- Deploy/log/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Deploy/log/Dockerfile b/Deploy/log/Dockerfile index 8d998367f..246746c6b 100644 --- a/Deploy/log/Dockerfile +++ b/Deploy/log/Dockerfile @@ -1,6 +1,5 @@ FROM library/ubuntu:14.04 - # run logrotate hourly, disable imklog model, provides TCP/UDP syslog reception RUN mv /etc/cron.daily/logrotate /etc/cron.hourly/ \ && sed 's/$ModLoad imklog/#$ModLoad imklog/' -i /etc/rsyslog.conf \