opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-12 01:38:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14281 from vrothberg/fix-14251

Browse Source 
fix --init with /dev bind mount
This commit is contained in:
OpenShift Merge Robot
2022-05-23 10:17:59 -04:00
committed by GitHub
parent be255287c9 633d5f1f8b
commit 7d00b0ea0d
7 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/run_test.go
View File

@@ -13,6 +13,7 @@ import (
"time"
"github.com/containers/common/pkg/cgroups"
"github.com/containers/podman/v4/libpod/define"
"github.com/containers/podman/v4/pkg/rootless"
. "github.com/containers/podman/v4/test/utils"
"github.com/containers/storage/pkg/stringid"
@@ -286,19 +287,20 @@ var _ = Describe("Podman run", func() {
result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0))
conData := result.InspectContainerToJSON()
Expect(conData[0]).To(HaveField("Path", "/dev/init"))
Expect(conData[0]).To(HaveField("Path", define.ContainerInitPath))
Expect(conData[0].Config.Annotations).To(HaveKeyWithValue("io.podman.annotations.init", "TRUE"))
})
It("podman run a container with --init and --init-path", func() {
session := podmanTest.Podman([]string{"run", "--name", "test", "--init", "--init-path", "/usr/libexec/podman/catatonit", ALPINE, "ls"})
// Also bind-mount /dev (#14251).
session := podmanTest.Podman([]string{"run", "-v", "/dev:/dev", "--name", "test", "--init", "--init-path", "/usr/libexec/podman/catatonit", ALPINE, "ls"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
result := podmanTest.Podman([]string{"inspect", "test"})
result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0))
conData := result.InspectContainerToJSON()
Expect(conData[0]).To(HaveField("Path", "/dev/init"))
Expect(conData[0]).To(HaveField("Path", define.ContainerInitPath))
Expect(conData[0].Config.Annotations).To(HaveKeyWithValue("io.podman.annotations.init", "TRUE"))
})