Unset Hostname when NetworkMode is container

The hostname can not be set on containers using a container network stack
pull/448/head
Raymon de Looff 5 years ago
parent af5d175e9f
commit fde6e73077

@ -138,6 +138,7 @@ func (c Container) StopSignal() string {
// the options overridden at runtime. // the options overridden at runtime.
func (c Container) runtimeConfig() *dockercontainer.Config { func (c Container) runtimeConfig() *dockercontainer.Config {
config := c.containerInfo.Config config := c.containerInfo.Config
hostConfig := c.containerInfo.HostConfig
imageConfig := c.imageInfo.Config imageConfig := c.imageInfo.Config
if config.WorkingDir == imageConfig.WorkingDir { if config.WorkingDir == imageConfig.WorkingDir {
@ -148,6 +149,10 @@ func (c Container) runtimeConfig() *dockercontainer.Config {
config.User = "" config.User = ""
} }
if hostConfig.NetworkMode.IsContainer() {
config.Hostname = ""
}
if util.SliceEqual(config.Cmd, imageConfig.Cmd) { if util.SliceEqual(config.Cmd, imageConfig.Cmd) {
config.Cmd = nil config.Cmd = nil
} }

Loading…
Cancel
Save