diff --git a/containers-common.spec b/containers-common.spec index 4f0771e..6aa1bd5 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -13,7 +13,7 @@ Epoch: 2 Name: containers-common Version: 1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildArch: noarch @@ -161,6 +161,10 @@ EOF %{_datadir}/rhel/secrets/* %changelog +* Tue Nov 02 2021 Jindrich Novy - 2:1-9 +- make log_driver = "k8s-file" default in containers.conf +- Related: #2000051 + * Fri Oct 01 2021 Jindrich Novy - 2:1-8 - perform only sanity/installability tests for now - Related: #2000051 diff --git a/containers.conf b/containers.conf index 8dc2919..a9f3a48 100644 --- a/containers.conf +++ b/containers.conf @@ -153,6 +153,7 @@ default_sysctls = [ # Logging driver for the container. Available options: k8s-file and journald. # #log_driver = "k8s-file" +log_driver = "k8s-file" # Maximum size allowed for the container log file. Negative numbers indicate # that no size limit is imposed. If positive, it must be >= 8192 to match or diff --git a/update.sh b/update.sh index fce0ff4..745f98b 100755 --- a/update.sh +++ b/update.sh @@ -24,6 +24,7 @@ spectool -f -g containers-common.spec ensure storage.conf driver \"overlay\" ensure storage.conf mountopt \"nodev,metacopy=on\" ensure containers.conf events_logger \"file\" +ensure containers.conf log_driver \"k8s-file\" if pwd | grep rhel-8 > /dev/null then ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"docker.io\"]