diff options
| author | cdoern <cdoern@redhat.com> | 2021-07-07 17:00:30 -0400 |
|---|---|---|
| committer | cdoern <cdoern@redhat.com> | 2021-07-15 10:34:09 -0400 |
| commit | f7321681d04d65da3b307d1e5e4ba12c42b5c456 (patch) | |
| tree | 8479b72f55d61a400a1eef4c3540fdb32d4e64d5 /cmd | |
| parent | 1a9cb93f16cf19e14581319e2fd1b60e791f74dd (diff) | |
| download | podman-f7321681d04d65da3b307d1e5e4ba12c42b5c456.tar.gz podman-f7321681d04d65da3b307d1e5e4ba12c42b5c456.tar.bz2 podman-f7321681d04d65da3b307d1e5e4ba12c42b5c456.zip | |
podman pod create --pid flag
added support for --pid flag. User can specify ns:file, pod, private, or host.
container returns an error since you cannot point the ns of the pods infra container
to a container outside of the pod.
Signed-off-by: cdoern <cdoern@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/containers/create.go | 1 | ||||
| -rw-r--r-- | cmd/podman/pods/create.go | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index 1e11c53d5..df0fa6f9d 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -293,6 +293,7 @@ func createPodIfNecessary(s *specgen.SpecGenerator, netOpts *entities.NetOptions Hostname: s.ContainerBasicConfig.Hostname, Cpus: cliVals.CPUS, CpusetCpus: cliVals.CPUSetCPUs, + Pid: cliVals.PID, } // Unset config values we passed to the pod to prevent them being used twice for the container and pod. s.ContainerBasicConfig.Hostname = "" diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index 03e3ffaa0..0d299bb9c 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -102,6 +102,10 @@ func init() { flags.StringVarP(&createOptions.Hostname, hostnameFlagName, "", "", "Set a hostname to the pod") _ = createCommand.RegisterFlagCompletionFunc(hostnameFlagName, completion.AutocompleteNone) + pidFlagName := "pid" + flags.StringVar(&createOptions.Pid, pidFlagName, "", "PID namespace to use") + _ = createCommand.RegisterFlagCompletionFunc(pidFlagName, common.AutocompleteNamespace) + podIDFileFlagName := "pod-id-file" flags.StringVar(&podIDFile, podIDFileFlagName, "", "Write the pod ID to the file") _ = createCommand.RegisterFlagCompletionFunc(podIDFileFlagName, completion.AutocompleteDefault) @@ -179,6 +183,8 @@ func create(cmd *cobra.Command, args []string) error { defer errorhandling.SyncQuiet(podIDFD) } + createOptions.Pid = cmd.Flag("pid").Value.String() + createOptions.Net, err = common.NetFlagsToNetOptions(cmd, createOptions.Infra) if err != nil { return err |