diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-08-14 14:59:24 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-15 11:38:18 +0000 |
| commit | cd7102a70e7f3555df832c4c1bcf958e121cbf4d (patch) | |
| tree | 9c87128880bf9b82c6b2fe6afed0d4e054dabba4 /pkg | |
| parent | 77baae25ce473cac57d107715bebdf914f2567a0 (diff) | |
| download | podman-cd7102a70e7f3555df832c4c1bcf958e121cbf4d.tar.gz podman-cd7102a70e7f3555df832c4c1bcf958e121cbf4d.tar.bz2 podman-cd7102a70e7f3555df832c4c1bcf958e121cbf4d.zip | |
Fix handling of hostname in --net=host
Hostname should be set to the hosts hostname when network is none.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1274
Approved by: giuseppe
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/spec/spec.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index d9888e999..bceae4677 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -1,6 +1,7 @@ package createconfig import ( + "os" "strings" "github.com/docker/docker/daemon/caps" @@ -73,6 +74,14 @@ func CreateConfigToOCISpec(config *CreateConfig) (*spec.Spec, error) { //nolint g.AddAnnotation(key, val) } g.SetRootReadonly(config.ReadOnlyRootfs) + if config.Hostname == "" { + if config.NetMode.IsHost() { + config.Hostname, err = os.Hostname() + if err != nil { + return nil, errors.Wrap(err, "unable to retrieve hostname") + } + } + } g.SetHostname(config.Hostname) if config.Hostname != "" { g.AddProcessEnv("HOSTNAME", config.Hostname) |