Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#2431 Correction for an edge case in local image repos (duplicates tags) #2692

Merged
merged 3 commits into from
May 13, 2020
Merged

#2431 Correction for an edge case in local image repos (duplicates tags) #2692

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88c47c3
#2431 Correction for an edge case in local image repos (duplicates re…
Choobz May 9, 2020
d77d62e
Indentation correction
Choobz May 13, 2020
630ef88
Indentation correction
Choobz May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions core/src/main/java/org/testcontainers/images/LocalImagesCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,14 @@ private void populateFromList(List<Image> images) {
}

cache.putAll(
Stream.of(repoTags).collect(Collectors.toMap(
DockerImageName::new,
it -> ImageData.from(image)
))
Stream.of(repoTags)
// Protection against some edge case where local image repository tags end up with duplicates
// making toMap crash at merge time.
.distinct()
.collect(Collectors.toMap(
DockerImageName::new,
it -> ImageData.from(image)
))
);
}
}
Expand Down