diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-05 09:41:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 09:41:26 -0400 |
| commit | f2432335ef1be0a6a4482354e3c288381127ee49 (patch) | |
| tree | 57940c3e3b9aa2d7626a513d6c0184a6137f0954 /pkg/specgen/generate/oci.go | |
| parent | 2f2ffd8678587db040ae76ef0231669ee19a5175 (diff) | |
| parent | 9be0d759b8dc6f1f5967d511c85924cd923b5ae6 (diff) | |
| download | podman-f2432335ef1be0a6a4482354e3c288381127ee49.tar.gz podman-f2432335ef1be0a6a4482354e3c288381127ee49.tar.bz2 podman-f2432335ef1be0a6a4482354e3c288381127ee49.zip | |
Merge pull request #6498 from mheon/fix_pod_hostname
Ensure that containers in pods properly set hostname
Diffstat (limited to 'pkg/specgen/generate/oci.go')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 11b18e2d0..266abd28d 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -118,7 +118,7 @@ func makeCommand(ctx context.Context, s *specgen.SpecGenerator, img *image.Image return finalCommand, nil } -func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runtime, rtc *config.Config, newImage *image.Image, mounts []spec.Mount) (*spec.Spec, error) { +func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runtime, rtc *config.Config, newImage *image.Image, mounts []spec.Mount, pod *libpod.Pod) (*spec.Spec, error) { var ( inUserNS bool ) @@ -300,7 +300,7 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt } // NAMESPACES - if err := specConfigureNamespaces(s, &g, rt); err != nil { + if err := specConfigureNamespaces(s, &g, rt, pod); err != nil { return nil, err } configSpec := g.Config |