upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 19:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6106 from reasonerjt/base-image-photo-20

Browse Source 
Fix permission issue in rsyslog container.
This commit is contained in:
Wenkai Yin 2018-10-23 14:13:45 +08:00 committed by GitHub
commit 7c55ad3a20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/photon/log/Dockerfile
View File

@ -14,7 +14,7 @@ COPY ./make/photon/log/rsyslog_docker.conf /etc/rsyslog.d/
RUN mv /etc/cron.daily/logrotate /etc/cron.hourly/logrotate RUN mv /etc/cron.daily/logrotate /etc/cron.hourly/logrotate
COPY ./make/photon/log/start.sh /usr/local/bin/ COPY ./make/photon/log/start.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/start.sh && \ RUN chmod +x /usr/local/bin/start.sh /etc/rsyslog.d/ && \
chown -R 10000:10000 /etc/rsyslog.conf /etc/rsyslog.d/ /run chown -R 10000:10000 /etc/rsyslog.conf /etc/rsyslog.d/ /run
HEALTHCHECK CMD netstat -ltu|grep 10514 HEALTHCHECK CMD netstat -ltu|grep 10514

6
make/photon/log/rsyslog.conf
View File

@ -41,9 +41,9 @@ $RepeatedMsgReduction on
# #
# Set the default permissions for all log files. # Set the default permissions for all log files.
# #
$FileOwner syslog #$FileOwner syslog
$FileGroup adm #$FileGroup adm
$FileCreateMode 0640 $FileCreateMode 0644
$DirCreateMode 0755 $DirCreateMode 0755
$Umask 0022 $Umask 0022
#$PrivDropToUser syslog #$PrivDropToUser syslog