diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-05 13:52:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-05 13:52:15 +0000 |
| commit | 1f0a24437d71f8fe2b2233a428202afcfe513666 (patch) | |
| tree | e17f57dce6bf61d38a74fc6b8f011bffbb4082fa /cmd/podman/common | |
| parent | 117583c293713f2baa920c4035e820ad59fe6622 (diff) | |
| parent | 3c3fa6fac4d0f8e89181ea2d4e1fe0318d24b6f4 (diff) | |
| download | podman-1f0a24437d71f8fe2b2233a428202afcfe513666.tar.gz podman-1f0a24437d71f8fe2b2233a428202afcfe513666.tar.bz2 podman-1f0a24437d71f8fe2b2233a428202afcfe513666.zip | |
Merge pull request #11011 from baude/initcontainers
implement init containers in podman
Diffstat (limited to 'cmd/podman/common')
| -rw-r--r-- | cmd/podman/common/create_opts.go | 1 | ||||
| -rw-r--r-- | cmd/podman/common/specgen.go | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 42e0efe5d..61f08b73b 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -61,6 +61,7 @@ type ContainerCLIOpts struct { HTTPProxy bool ImageVolume string Init bool + InitContainerType string InitPath string Interactive bool IPC string diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 42f515ace..118091855 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -659,6 +659,8 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string s.PidFile = c.PidFile s.Volatile = c.Rm + // Initcontainers + s.InitContainerType = c.InitContainerType return nil } |