fix: resolve merge issues

This commit is contained in:
Simon Aronsson 2019-07-23 09:36:04 +02:00
parent dff16dc639
commit 874180a518
2 changed files with 3 additions and 2 deletions

View file

@ -247,7 +247,7 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
// the pull request will be aborted prematurely unless the response is read
if _, err = ioutil.ReadAll(response); err != nil {
log.Error(err)
}
}
}
newImageInfo, _, err := client.api.ImageInspectWithRaw(bg, imageName)