diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-19 13:33:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-19 13:33:15 +0200 |
commit | 98dee275d04dafa087db12bc3f0593a078039cfb (patch) | |
tree | 51a0fbeae3dd23c6c29c4b74e6a6503557e74a39 /libpod/runtime_pod_infra_linux.go | |
parent | 438cbf4c8960db0b59a25a3fb38a778e24a69a40 (diff) | |
parent | 7aefc1ac33ba153f6177e9fe3c4da886de49a9e2 (diff) | |
download | podman-98dee275d04dafa087db12bc3f0593a078039cfb.tar.gz podman-98dee275d04dafa087db12bc3f0593a078039cfb.tar.bz2 podman-98dee275d04dafa087db12bc3f0593a078039cfb.zip |
Merge pull request #3836 from chenzhiwei/hostname
Allow customizing pod hostname
Diffstat (limited to 'libpod/runtime_pod_infra_linux.go')
-rw-r--r-- | libpod/runtime_pod_infra_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go index 5387eb587..ad6662f03 100644 --- a/libpod/runtime_pod_infra_linux.go +++ b/libpod/runtime_pod_infra_linux.go @@ -31,8 +31,8 @@ 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 + // Set Pod hostname + g.Config.Hostname = p.config.Hostname isRootless := rootless.IsRootless() |