Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-12-14 06:06:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #448 from raymondelooff/bugfix/188

Browse source 
Unset Hostname when NetworkMode is container
This commit is contained in:
Simon Aronsson 2020-02-08 14:35:51 +01:00 • committed by GitHub
commit bd1b3c1c89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
} }