self-hosted/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-07-15 23:54:22 +02:00
Code Issues Releases Activity

Unset Hostname when NetworkMode is container

Browse Source 
The hostname can not be set on containers using a container network stack
This commit is contained in:
Raymon de Looff
2020-02-07 21:23:49 +01:00
parent af5d175e9f
commit fde6e73077
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/container/container.go
View File

@ -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
} }