Skip to content

Commit da5c57c

Browse files
gloursndeloof
authored andcommitted
test digest or canonical reference, not only tag, when checking if an image is already present
Signed-off-by: Guillaume Lours <[email protected]>
1 parent e25265d commit da5c57c

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

pkg/compose/pull.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,14 @@ func imageAlreadyPresent(serviceImage string, localImages map[string]api.ImageSu
159159
if err != nil {
160160
return false
161161
}
162-
tagged, ok := normalizedImage.(reference.NamedTagged)
163-
if !ok {
164-
return false
162+
switch refType := normalizedImage.(type) {
163+
case reference.NamedTagged:
164+
_, ok := localImages[serviceImage]
165+
return ok && refType.Tag() != "latest"
166+
default:
167+
_, ok := localImages[serviceImage]
168+
return ok
165169
}
166-
_, ok = localImages[serviceImage]
167-
return ok && tagged.Tag() != "latest"
168170
}
169171

170172
func getUnwrappedErrorMessage(err error) string {

0 commit comments

Comments
 (0)