containers-common-0.60.2-4.el10

- update update.sh script and set logdriver to file
- Resolves: RHEL-57101

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

containers-common.spec

@@ -40,7 +40,7 @@ Epoch: 5
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
 Version: 0.60.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Apache-2.0
 BuildArch: noarch
 # for BuildRequires: go-md2man
@@ -227,6 +227,10 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/
 %files extra
 
 %changelog
+* Thu Sep 05 2024 Jindrich Novy <jnovy@redhat.com> - 5:0.60.2-4
+- update update.sh script and set logdriver to file
+- Resolves: RHEL-57101
+
 * Wed Aug 28 2024 Jindrich Novy <jnovy@redhat.com> - 5:0.60.2-3
 - Obsolete containernetworking-plugins
 - Resolves: RHEL-39410

containers.conf

@@ -183,7 +183,7 @@ default_sysctls = [
 
 # Logging driver for the container. Available options: k8s-file and journald.
 #
-log_driver = "journald"
+log_driver = "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

update.sh

@@ -30,10 +30,11 @@ for FILE in *; do
 done
 ensure storage.conf    driver                        \"overlay\"
 ensure storage.conf    mountopt                      \"nodev,metacopy=on\"
-if pwd | grep rhel-8 > /dev/null
+ensure registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"]
+
+if pwd | grep -e rhel-8 -e c8s > /dev/null
 then
 awk -i inplace '/#default_capabilities/,/#\]/{gsub("#","",$0)}1' containers.conf
-ensure registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"permissive\"
 ensure containers.conf runtime                       \"runc\"
 ensure containers.conf events_logger                 \"file\"
@@ -49,19 +50,22 @@ then
   sed -i '/^default_capabilities/a \
   "SYS_CHROOT",' containers.conf
 fi
-else
+
-ensure registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"]
+elif pwd | grep -e rhel-9 -e c9s > /dev/null
+then
 ensure registries.conf short-name-mode               \"enforcing\"
 ensure containers.conf runtime                       \"crun\"
+
+elif pwd | grep -e rhel-10 -e c10s > /dev/null
+then
+ensure registries.conf short-name-mode               \"enforcing\"
+ensure containers.conf runtime                       \"crun\"
+ensure containers.conf log_driver                    \"file\"
+else
+echo "Unknown release"
 fi
+
 [ `grep \"keyctl\", seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
 				"keyctl",' seccomp.json
 [ `grep \"socket\", seccomp.json | wc -l` == 0 ] && sed -i '/\"socketcall\",/i \
 				"socket",' seccomp.json
-rhpkg clone redhat-release
-cd redhat-release
-rhpkg switch-branch rhel-9.4.0
-rhpkg prep
-cp -f redhat-release-*/RPM-GPG* ../
-cd -
-rm -rf redhat-release