Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2026-02-26 00:44:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add additional test and further rework client mocks

Browse source
This commit is contained in:
nils måsén 2023-08-08 18:04:34 +02:00
parent abbdaa834c
commit e97671f293
6 changed files with 384 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkg/container/client.go
View file

@ -157,12 +157,18 @@ func (client dockerClient) GetContainer(containerID t.ContainerID) (t.Container,
return &Container{}, err
}
containerNetworkMode := strings.Split(string(containerInfo.HostConfig.NetworkMode), ":")
if len(containerNetworkMode) == 2 && containerNetworkMode[0] == "container" {
parentContainer, err := client.api.ContainerInspect(bg, containerNetworkMode[1])
netType, netContainerId, found := strings.Cut(string(containerInfo.HostConfig.NetworkMode), ":")
if found && netType == "container" {
parentContainer, err := client.api.ContainerInspect(bg, netContainerId)
if err != nil {
log.Debug("Unable to fetch parentContainer.")
log.WithFields(map[string]interface{}{
"container": containerInfo.Name,
"error": err,
"network-container": netContainerId,
}).Warnf("Unable to resolve network container: %v", err)
} else {
// Replace the container ID with a container name to allow it to reference the re-created network container
containerInfo.HostConfig.NetworkMode = container.NetworkMode(fmt.Sprintf("container:%s", parentContainer.Name))
}
}