summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-15 18:44:39 +0200
committerGitHub <noreply@github.com>2019-08-15 18:44:39 +0200
commit74224d9b7ce7b2cfec551b6f16005642cb2fa4df (patch)
tree1612a8e3378aae7717934c769d6e32cfb86f5f15
parent3f1657d729b4f4c367b3e124621a6f3a9a5769d4 (diff)
parent4f0ab1cc8df5958c760006d58dea768954aa0d01 (diff)
downloadpodman-74224d9b7ce7b2cfec551b6f16005642cb2fa4df.tar.gz
podman-74224d9b7ce7b2cfec551b6f16005642cb2fa4df.tar.bz2
podman-74224d9b7ce7b2cfec551b6f16005642cb2fa4df.zip
Merge pull request #3818 from chenzhiwei/hostname
Set Pod hostname as Pod name
-rw-r--r--libpod/runtime_pod_infra_linux.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go
index da35b7f93..24651099f 100644
--- a/libpod/runtime_pod_infra_linux.go
+++ b/libpod/runtime_pod_infra_linux.go
@@ -30,6 +30,9 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, imgID
return nil, err
}
+ // Set Pod hostname as Pod name
+ g.Config.Hostname = p.config.Name
+
isRootless := rootless.IsRootless()
entryCmd := []string{r.config.InfraCommand}