diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-06 12:11:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-06 12:11:32 +0000 |
| commit | 0eb2a02620e28383d3e4458854411f277d1e30f7 (patch) | |
| tree | 99aa742239301d68d067070bbc5bbb2fa5f76ce5 /cmd | |
| parent | a82ceafb73356d8e3ed825be2f0ad0a29b7c3761 (diff) | |
| parent | 541e83ffe285cc67f4635d2dd1e7c89135140a13 (diff) | |
| download | podman-0eb2a02620e28383d3e4458854411f277d1e30f7.tar.gz podman-0eb2a02620e28383d3e4458854411f277d1e30f7.tar.bz2 podman-0eb2a02620e28383d3e4458854411f277d1e30f7.zip | |
Merge pull request #11141 from flouthoc/support-linux-execution-domain
personality: Add support for setting execution domain.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common/create.go | 8 | ||||
| -rw-r--r-- | cmd/podman/common/create_opts.go | 1 | ||||
| -rw-r--r-- | cmd/podman/common/specgen.go | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index 96414add4..602ad5d94 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -498,6 +498,14 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) { ) _ = cmd.RegisterFlagCompletionFunc(variantFlagName, completion.AutocompleteNone) + personalityFlagName := "personality" + createFlags.StringVar( + &cf.Personality, + personalityFlagName, "", + "Configure execution domain using personality (e.g., LINUX/LINUX32)", + ) + _ = cmd.RegisterFlagCompletionFunc(personalityFlagName, AutocompleteNamespace) + pidFlagName := "pid" createFlags.String( pidFlagName, "", diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 61f08b73b..0a969bfd2 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -81,6 +81,7 @@ type ContainerCLIOpts struct { Arch string OS string Variant string + Personality string PID string PIDsLimit *int64 Platform string diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 118091855..8d6a21cb7 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -651,6 +651,12 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string if err != nil { return err } + + if c.Personality != "" { + s.Personality = &specs.LinuxPersonality{} + s.Personality.Domain = specs.LinuxPersonalityDomain(c.Personality) + } + s.Remove = c.Rm s.StopTimeout = &c.StopTimeout s.Timeout = c.Timeout |