diff --git a/make/common/rsyslog/Dockerfile b/make/common/rsyslog/Dockerfile deleted file mode 100644 index cd0027005..000000000 --- a/make/common/rsyslog/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM vmware/photon:1.0 - -#base image for rsyslog base on photon - -RUN tdnf distro-sync -y || echo \ - && tdnf install -y cronie rsyslog shadow tar gzip \ - && mkdir /etc/rsyslog.d/ \ - && mkdir /var/spool/rsyslog \ - && groupadd -r -g 10000 syslog && useradd --no-log-init -r -g 10000 -u 10000 syslog \ - && tdnf clean all diff --git a/make/photon/log/Dockerfile b/make/photon/log/Dockerfile index 1d34c93a0..c82bf07f8 100644 --- a/make/photon/log/Dockerfile +++ b/make/photon/log/Dockerfile @@ -1,8 +1,14 @@ -FROM vmware/rsyslog-photon:8.15.0 +FROM vmware/photon:1.0 + +RUN tdnf distro-sync -y || echo \ + && tdnf install -y cronie rsyslog shadow tar gzip sudo net-tools\ + && mkdir /etc/rsyslog.d/ \ + && mkdir /var/spool/rsyslog \ + && groupadd -r -g 10000 syslog && useradd --no-log-init -r -g 10000 -u 10000 syslog \ + && tdnf clean all COPY rsyslog.conf /etc/rsyslog.conf -# rotate logs weekly # notes: file name cannot contain dot, or the script will not run COPY rotate.sh /etc/cron.daily/rotate @@ -11,7 +17,6 @@ COPY rsyslog_docker.conf /etc/rsyslog.d/ COPY start.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/start.sh && \ - tdnf install -y sudo net-tools && \ chown -R 10000:10000 /run HEALTHCHECK CMD netstat -ltu|grep 10514 @@ -20,5 +25,4 @@ VOLUME /var/log/docker/ /run/ EXPOSE 10514 -#CMD crond && rm -f /var/run/rsyslogd.pid && rsyslogd -n CMD /usr/local/bin/start.sh