Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-24 19:42:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3559 from reasonerjt/deprivilege-harbor-core

Browse Source 
Remove the Dockerfile of rsyslog image
This commit is contained in:
Daniel Jiang 2017-11-07 14:27:46 +08:00 committed by GitHub
commit a7640a5000
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/common/rsyslog/Dockerfile
View File

@ -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

12
make/photon/log/Dockerfile
View File

@ -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 COPY rsyslog.conf /etc/rsyslog.conf
# rotate logs weekly
# notes: file name cannot contain dot, or the script will not run # notes: file name cannot contain dot, or the script will not run
COPY rotate.sh /etc/cron.daily/rotate COPY rotate.sh /etc/cron.daily/rotate
@ -11,7 +17,6 @@ COPY rsyslog_docker.conf /etc/rsyslog.d/
COPY start.sh /usr/local/bin/ COPY start.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/start.sh && \ RUN chmod +x /usr/local/bin/start.sh && \
tdnf install -y sudo net-tools && \
chown -R 10000:10000 /run chown -R 10000:10000 /run
HEALTHCHECK CMD netstat -ltu|grep 10514 HEALTHCHECK CMD netstat -ltu|grep 10514
@ -20,5 +25,4 @@ VOLUME /var/log/docker/ /run/
EXPOSE 10514 EXPOSE 10514
#CMD crond && rm -f /var/run/rsyslogd.pid && rsyslogd -n
CMD /usr/local/bin/start.sh CMD /usr/local/bin/start.sh