Skip to content

Commit

Permalink
Workaround containers.conf log_driver issue
Browse files Browse the repository at this point in the history
Ref: containers/podman#12029

Workaround this by commenting out the log_driver line if it's found to
be un-commented.

Signed-off-by: Chris Evich <[email protected]>
  • Loading branch information
cevich committed Nov 8, 2021
1 parent 3013116 commit 91ce3d9
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions cache_images/fedora_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ 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"
note="- commented-out during VM image build"
if grep -Eq '^log_driver.+journald' "$cconf"; then
warn "Patching out $cconf journald log_driver"
$SUDO sed -r -i -e "s/^log_driver(.*)/# log_driver\1 $note/" "$cconf"
fi

if ! ((CONTAINER)); then
msg "Enabling cgroup management from containers"
ooe.sh $SUDO setsebool -P container_manage_cgroup true
Expand Down

0 comments on commit 91ce3d9

Please sign in to comment.