diff --git a/cache_images/fedora_setup.sh b/cache_images/fedora_setup.sh index bf2cb5f5..385b270c 100644 --- a/cache_images/fedora_setup.sh +++ b/cache_images/fedora_setup.sh @@ -23,6 +23,16 @@ req_env_vars PACKER_BUILD_NAME bash $SCRIPT_DIRPATH/fedora_packaging.sh +# Workaround for issue +# https://github.com/containers/podman/issues/12029 +# where containers.conf has a default 'log_driver = journald' +# which breaks podman's containerized integration testing. +cconf="/usr/share/containers/containers.conf" +if grep -Eq '^log_driver.+journald' "$cconf"; then + warn "Patching out $cconf journald log_driver" + sed -r -i -e 's/^log_driver(.*)/# log_driver\1/' "$cconf" +fi + if ! ((CONTAINER)); then msg "Enabling cgroup management from containers" ooe.sh $SUDO setsebool -P container_manage_cgroup true