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

Fix --init and --init-path

Browse Source 
Init properly passed into specgen
Allow --init with --systemd=true but not --systemd=always.

Signed-off-by: Joseph Gooch <mrwizard@dok.org>
This commit is contained in:
Joseph Gooch
2020-06-16 14:57:43 +00:00
parent 0968f25988
commit eb8bfdad3e
4 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -563,6 +563,8 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
// we dont think these are in the spec // we dont think these are in the spec
// init - initbinary // init - initbinary
// initpath // initpath
s.Init = c.Init
s.InitPath = c.InitPath
s.Stdin = c.Interactive s.Stdin = c.Interactive
// quiet // quiet
// DeviceCgroupRules: c.StringSlice("device-cgroup-rule"), // DeviceCgroupRules: c.StringSlice("device-cgroup-rule"),

2
pkg/specgen/generate/oci.go
View File

@ -112,7 +112,7 @@ func makeCommand(ctx context.Context, s *specgen.SpecGenerator, img *image.Image
if initPath == "" { if initPath == "" {
return nil, errors.Errorf("no path to init binary found but container requested an init") return nil, errors.Errorf("no path to init binary found but container requested an init")
} }
finalCommand = append([]string{initPath, "--"}, finalCommand...) finalCommand = append([]string{"/dev/init", "--"}, finalCommand...)
} }
return finalCommand, nil return finalCommand, nil

4
pkg/specgen/generate/storage.go
View File

@ -314,8 +314,8 @@ func addContainerInitBinary(s *specgen.SpecGenerator, path string) (spec.Mount,
if !s.PidNS.IsPrivate() { if !s.PidNS.IsPrivate() {
return mount, fmt.Errorf("cannot add init binary as PID 1 (PID namespace isn't private)") return mount, fmt.Errorf("cannot add init binary as PID 1 (PID namespace isn't private)")
} }
if s.Systemd == "true" || s.Systemd == "always" { if s.Systemd == "always" {
return mount, fmt.Errorf("cannot use container-init binary with systemd") return mount, fmt.Errorf("cannot use container-init binary with systemd=always")
} }
if _, err := os.Stat(path); os.IsNotExist(err) { if _, err := os.Stat(path); os.IsNotExist(err) {
return mount, errors.Wrap(err, "container-init binary not found on the host") return mount, errors.Wrap(err, "container-init binary not found on the host")

24
test/e2e/run_test.go
View File

@ -151,12 +151,36 @@ var _ = Describe("Podman run", func() {
session := podmanTest.Podman([]string{"run", "--init", ALPINE, "ls"}) session := podmanTest.Podman([]string{"run", "--init", ALPINE, "ls"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
result := podmanTest.Podman([]string{"inspect", "-l"})
result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0))
conData := result.InspectContainerToJSON()
Expect(conData[0].Path).To(Equal("/dev/init"))
Expect(conData[0].Config.Annotations["io.podman.annotations.init"]).To(Equal("TRUE"))
}) })
It("podman run a container with --init and --init-path", func() { It("podman run a container with --init and --init-path", func() {
session := podmanTest.Podman([]string{"run", "--init", "--init-path", "/usr/libexec/podman/catatonit", ALPINE, "ls"}) session := podmanTest.Podman([]string{"run", "--init", "--init-path", "/usr/libexec/podman/catatonit", ALPINE, "ls"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
result := podmanTest.Podman([]string{"inspect", "-l"})
result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0))
conData := result.InspectContainerToJSON()
Expect(conData[0].Path).To(Equal("/dev/init"))
Expect(conData[0].Config.Annotations["io.podman.annotations.init"]).To(Equal("TRUE"))
})
It("podman run a container without --init", func() {
session := podmanTest.Podman([]string{"run", ALPINE, "ls"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
result := podmanTest.Podman([]string{"inspect", "-l"})
result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0))
conData := result.InspectContainerToJSON()
Expect(conData[0].Path).To(Equal("ls"))
Expect(conData[0].Config.Annotations["io.podman.annotations.init"]).To(Equal("FALSE"))
}) })
It("podman run seccomp test", func() { It("podman run seccomp test", func() {