From d949b888f3fafd8631427f94d1e7b936eec40f23 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Fri, 10 Dec 2021 17:37:28 +0100 Subject: [PATCH] containers-common-1-16.el9 - do not hardcode log_driver = "journald" and events_logger = "journald" for RHEL9 and leave the rootful/rootless behaviour change based on internal logic - Related: #2000051 Signed-off-by: Jindrich Novy --- containers-common.spec | 8 +++++++- containers.conf | 2 -- update.sh | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/containers-common.spec b/containers-common.spec index 7a2d79d..88ee80e 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -12,7 +12,7 @@ Epoch: 2 Name: containers-common Version: 1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildArch: noarch @@ -160,6 +160,12 @@ EOF %{_datadir}/rhel/secrets/* %changelog +* Fri Dec 10 2021 Jindrich Novy - 2:1-16 +- do not hardcode log_driver = "journald" and events_logger = "journald" + for RHEL9 and leave the rootful/rootless behaviour change based on + internal logic +- Related: #2000051 + * Thu Dec 09 2021 Jindrich Novy - 2:1-15 - do not allow broken content from Pyxis to land in shortnames.conf - Related: #2000051 diff --git a/containers.conf b/containers.conf index 417c54c..3617777 100644 --- a/containers.conf +++ b/containers.conf @@ -153,7 +153,6 @@ default_sysctls = [ # Logging driver for the container. Available options: k8s-file and journald. # #log_driver = "k8s-file" -log_driver = "journald" # 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 @@ -342,7 +341,6 @@ log_driver = "journald" # Valid values are `journald`, `file` and `none`. # #events_logger = "journald" -events_logger = "journald" # A is a list of directories which are used to search for helper binaries. # diff --git a/update.sh b/update.sh index c0b016d..e79aed1 100755 --- a/update.sh +++ b/update.sh @@ -36,8 +36,6 @@ ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.o ensure registries.conf short-name-mode \"enforcing\" ensure containers.conf infra_image \"registry.access.redhat.com/ubi8/pause\" ensure containers.conf runtime \"crun\" -ensure containers.conf events_logger \"journald\" -ensure containers.conf log_driver \"journald\" fi [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \ "keyctl",' seccomp.json