diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-06 14:51:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-06 14:51:22 +0000 |
| commit | ca5bebb0825a738ee04c073646696906db95c97c (patch) | |
| tree | edc2990099171183914478cb101ce1562bdf95c2 /pkg/specgen/generate/container_create.go | |
| parent | 49df3cc5cb7e6a1d9e28cacfa86562abbdf48fd9 (diff) | |
| parent | 8f2d9e7a7c30f5e74f6aa0375b21a4522ec81756 (diff) | |
| download | podman-ca5bebb0825a738ee04c073646696906db95c97c.tar.gz podman-ca5bebb0825a738ee04c073646696906db95c97c.tar.bz2 podman-ca5bebb0825a738ee04c073646696906db95c97c.zip | |
Merge pull request #14501 from cdoern/podUTS
podman pod create --uts support
Diffstat (limited to 'pkg/specgen/generate/container_create.go')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 6b2e90b22..f31e46090 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -133,6 +133,12 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener options = append(options, libpod.WithRootFSFromImage(newImage.ID(), resolvedImageName, s.RawImageName)) } + + _, err = rt.LookupPod(s.Hostname) + if len(s.Hostname) > 0 && !s.UtsNS.IsPrivate() && err == nil { + // ok, we are incorrectly setting the pod as the hostname, lets undo that before validation + s.Hostname = "" + } if err := s.Validate(); err != nil { return nil, nil, nil, errors.Wrap(err, "invalid config provided") } |