opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 20:26:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

set --conmon-pidfile

Browse Source 
The --conmon-pidfile was not set in the spec leading to failing systemd
units.  Also add a system test to prevent future regressions.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2020-05-08 10:30:57 +02:00
parent ab518cdba0
commit 676efd89d5
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/podman/common/specgen.go
View File

@ -501,6 +501,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
s.CapDrop = c.CapDrop s.CapDrop = c.CapDrop
s.Privileged = c.Privileged s.Privileged = c.Privileged
s.ReadOnlyFilesystem = c.ReadOnly s.ReadOnlyFilesystem = c.ReadOnly
s.ConmonPidFile = c.ConmonPIDFile
// TODO // TODO
// ouitside of specgen and oci though // ouitside of specgen and oci though

16
test/system/030-run.bats
View File

@ -158,4 +158,20 @@ echo $rand | 0 | $rand
run_podman 1 image exists $NONLOCAL_IMAGE run_podman 1 image exists $NONLOCAL_IMAGE
} }
# 'run --conmon-pidfile --cid-file' makes sure we don't regress on these flags.
# Both are critical for systemd units.
@test "podman run --conmon-pidfile --cidfile" {
pid=$(mktemp)
cid=$(mktemp)
# CID file exists -> expected to fail.
run_podman 125 run --rm --conmon-pidfile=$pid --cidfile=$cid $IMAGE ls
rm $pid $cid
run_podman run --name keepme --conmon-pidfile=$pid --cidfile=$cid --detach $IMAGE sleep infinity
stat $pid $cid
run_podman rm -f keepme
rm $pid $cid
}
# vim: filetype=sh # vim: filetype=sh