diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-10-19 15:25:06 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-10-20 10:31:15 -0400 |
| commit | 1b288a35ba931c0b524af550749a7c1fd48b452f (patch) | |
| tree | c13115fc7f40591e317f6025c5be608cdcd2c900 /pkg | |
| parent | 9f98b3447c7a1c34d328a387993722e4e7113cd2 (diff) | |
| download | podman-1b288a35ba931c0b524af550749a7c1fd48b452f.tar.gz podman-1b288a35ba931c0b524af550749a7c1fd48b452f.tar.bz2 podman-1b288a35ba931c0b524af550749a7c1fd48b452f.zip | |
Ensure that hostname is added to hosts with net=host
When a container uses --net=host the default hostname is set to
the host's hostname. However, we were not creating any entries
in `/etc/hosts` despite having a hostname, which is incorrect.
This hostname, for Docker compat, will always be the hostname of
the host system, not the container, and will be assigned to IP
127.0.1.1 (not the standard localhost address).
Also, when `--hostname` and `--net=host` are both passed, still
use the hostname from `--hostname`, not the host's hostname (we
still use the host's hostname by default in this case if the
`--hostname` flag is not passed).
Fixes #8054
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgen/generate/namespaces.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index 7adb8be6a..7e4f09dc4 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -342,7 +342,7 @@ func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt return errors.Wrapf(err, "error looking up container to share uts namespace with") } hostname = utsCtr.Hostname() - case s.NetNS.NSMode == specgen.Host || s.UtsNS.NSMode == specgen.Host: + case (s.NetNS.NSMode == specgen.Host && hostname == "") || s.UtsNS.NSMode == specgen.Host: tmpHostname, err := os.Hostname() if err != nil { return errors.Wrap(err, "unable to retrieve hostname of the host") |