From fde6e730770521919fec63d04bbe0b93dff846f4 Mon Sep 17 00:00:00 2001 From: Raymon de Looff Date: Fri, 7 Feb 2020 21:23:49 +0100 Subject: [PATCH] Unset Hostname when NetworkMode is container The hostname can not be set on containers using a container network stack --- pkg/container/container.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/container/container.go b/pkg/container/container.go index 99868f3..a736873 100644 --- a/pkg/container/container.go +++ b/pkg/container/container.go @@ -138,6 +138,7 @@ func (c Container) StopSignal() string { // the options overridden at runtime. func (c Container) runtimeConfig() *dockercontainer.Config { config := c.containerInfo.Config + hostConfig := c.containerInfo.HostConfig imageConfig := c.imageInfo.Config if config.WorkingDir == imageConfig.WorkingDir { @@ -148,6 +149,10 @@ func (c Container) runtimeConfig() *dockercontainer.Config { config.User = "" } + if hostConfig.NetworkMode.IsContainer() { + config.Hostname = "" + } + if util.SliceEqual(config.Cmd, imageConfig.Cmd) { config.Cmd = nil }