diff options
| -rw-r--r-- | contrib/podmanimage/stable/containers.conf | 2 | ||||
| -rw-r--r-- | test/system/500-networking.bats | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/contrib/podmanimage/stable/containers.conf b/contrib/podmanimage/stable/containers.conf index 7f0e36224..220c1f850 100644 --- a/contrib/podmanimage/stable/containers.conf +++ b/contrib/podmanimage/stable/containers.conf @@ -5,7 +5,7 @@ ipcns="host" utsns="host" cgroupns="host" cgroups="disabled" -log_driver = "k8s_file" +log_driver = "k8s-file" [engine] cgroup_manager = "cgroupfs" events_logger="file" diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats index 94980346e..34220829a 100644 --- a/test/system/500-networking.bats +++ b/test/system/500-networking.bats @@ -88,8 +88,9 @@ load helpers # Wait for container to restart retries=20 while :;do - run_podman '?' container inspect --format "{{.State.Pid}}" myweb - if [[ $status -eq 0 ]]; then + run_podman container inspect --format "{{.State.Pid}}" myweb + # pid is 0 as long as the container is not running + if [[ $output -ne 0 ]]; then if [[ $output == $pid ]]; then die "This should never happen! Restarted container has same PID ($output) as killed one!" fi |