starlingx/integ
Code Issues Proposed changes

Merge "Docker logs are not rotating"

Browse Source
This commit is contained in:
Zuul 2019-05-08 19:01:11 +00:00 committed by Gerrit Code Review
commit dcbe61a3f0
4 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-files/docker-config/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="$PKG_BASE/files" SRC_DIR="$PKG_BASE/files"
TIS_PATCH_VER=1 TIS_PATCH_VER=2

1
config-files/docker-config/centos/docker-config.spec
View File

@ -29,3 +29,4 @@ make DATADIR=%{buildroot}%{_datadir} SYSCONFDIR=%{buildroot}%{_sysconfdir} insta
%dir %{_sysconfdir}/systemd/system/docker.service.d %dir %{_sysconfdir}/systemd/system/docker.service.d
%{_sysconfdir}/pmon.d/docker.conf %{_sysconfdir}/pmon.d/docker.conf
%{_sysconfdir}/systemd/system/docker.service.d/docker-stx-override.conf %{_sysconfdir}/systemd/system/docker.service.d/docker-stx-override.conf
%{_sysconfdir}/logrotate.d/docker.logrotate

2
config-files/docker-config/files/Makefile
View File

@ -9,3 +9,5 @@ install:
install -D -m 644 docker-pmond.conf $(SYSCONFDIR)/pmon.d/docker.conf install -D -m 644 docker-pmond.conf $(SYSCONFDIR)/pmon.d/docker.conf
install -d -m 0755 $(SYSCONFDIR)/systemd/system/docker.service.d install -d -m 0755 $(SYSCONFDIR)/systemd/system/docker.service.d
install -D -m 644 docker-stx-override.conf $(SYSCONFDIR)/systemd/system/docker.service.d/docker-stx-override.conf install -D -m 644 docker-stx-override.conf $(SYSCONFDIR)/systemd/system/docker.service.d/docker-stx-override.conf
install -d -m 0755 $(SYSCONFDIR)/logrotate.d
install -D -m 644 docker.logrotate $(SYSCONFDIR)/logrotate.d/docker.logrotate

42
config-files/docker-config/files/docker.logrotate Normal file
View File

@ -0,0 +1,42 @@
#
# Copyright (c) 2019 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
#
# copytruncate: Truncate the original log file in place after creating a copy,
# instead of moving the old log file and optionally creating a new one. It is
# used when some program can not be told to close its logfile and thus might
# continue writing (appending) to the previous log file forever. This prevents
# having to possibly reset the file handle of the log file.
/var/lib/docker/containers/*/*-json.log
{
nodateext
size 50M
start 1
rotate 20
missingok
notifempty
compress
delaycompress
copytruncate
}
/var/lib/docker/overlay2/*/diff/var/log/apt/history.log
/var/lib/docker/overlay2/*/diff/var/log/bootstrap.log
/var/lib/docker/overlay2/*/diff/var/log/apt/term.log
/var/lib/docker/overlay2/*/diff/var/log/dpkg.log
/var/lib/docker/overlay2/*/diff/var/log/alternatives.log
{
nodateext
size 10M
start 1
rotate 20
missingok
notifempty
compress
delaycompress
copytruncate
}