diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-06-04 16:32:10 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-06-04 16:32:10 -0400 |
| commit | 644a7b78ff1d2ee7805d8ddc105827b421ec598d (patch) | |
| tree | ee50174235ecab7ed5be1e81d8a88e7cf370468a /pkg/specgen/generate/container_create.go | |
| parent | b0578963aaf83e4c5686b957fd09c9311eac35c6 (diff) | |
| download | podman-644a7b78ff1d2ee7805d8ddc105827b421ec598d.tar.gz podman-644a7b78ff1d2ee7805d8ddc105827b421ec598d.tar.bz2 podman-644a7b78ff1d2ee7805d8ddc105827b421ec598d.zip | |
Ensure that containers in pods properly set hostname
When we moved to the new Namespace types in Specgen, we made a
distinction between taking a namespace from a pod, and taking it
from another container. Due to this new distinction, some code
that previously worked for both `--pod=$ID` and
`--uts=container:$ID` has accidentally become conditional on only
the latter case. This happened for Hostname - we weren't properly
setting it in cases where the container joined a pod.
Fortunately, this is an easy fix once we know to check the
condition.
Also, ensure that `podman pod inspect` actually prints hostname.
Fixes #6494
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg/specgen/generate/container_create.go')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 7ddfed339..de398d1e3 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -114,7 +114,7 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener } options = append(options, libpod.WithExitCommand(exitCommandArgs)) - runtimeSpec, err := SpecGenToOCI(ctx, s, rt, rtc, newImage, finalMounts) + runtimeSpec, err := SpecGenToOCI(ctx, s, rt, rtc, newImage, finalMounts, pod) if err != nil { return nil, err } |