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

Don’t delete cmd when runtime entrypoint is different

Browse source
This commit is contained in:
John Clayton 2019-12-18 16:40:02 -07:00
parent 9389e8f34f
commit 4f120ef037
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkg/container/container.go
View file

@ -143,12 +143,11 @@ func (c Container) runtimeConfig() *dockercontainer.Config {
config.User = "" config.User = ""
} }
if util.SliceEqual(config.Entrypoint, imageConfig.Entrypoint) {
config.Entrypoint = nil
if util.SliceEqual(config.Cmd, imageConfig.Cmd) { if util.SliceEqual(config.Cmd, imageConfig.Cmd) {
config.Cmd = nil config.Cmd = nil
} }
if util.SliceEqual(config.Entrypoint, imageConfig.Entrypoint) {
config.Entrypoint = nil
} }
config.Env = util.SliceSubtract(config.Env, imageConfig.Env) config.Env = util.SliceSubtract(config.Env, imageConfig.Env)