Compose: Make DockerComposeContainer only pull necessary images when multiple compose files were given #3787
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
askfor
changed the title
askfor
force-pushed
the
master
branch
2 times, most recently
from
0f80449
to
306cb3e
Compare
vcvitaly
reviewed
Mar 10, 2021
| @@ -29,7 +30,7 @@ | |||
| private final File composeFile; | |||
|
|
|||
| @Getter | |||
| private Set<String> dependencyImageNames = new HashSet<>(); | |||
| private Map<String, Set<String>> dependencyImageNames = new HashMap<>(); | |||
There was a problem hiding this comment.
I wold suggest to name a map as per this convention:
https://stackoverflow.com/questions/2253453/how-should-i-name-a-java-util-map
There was a problem hiding this comment.
Good to know, have changed it to serviceNameToImageNames
vcvitaly
reviewed
Mar 10, 2021
| Set<String> dependencyImageNames = new HashSet<>(); | ||
|
|
||
| Collection<Set<String>> serviceDependencyImageNames = parsedComposeFiles.stream() | ||
| .flatMap(it -> it.getDependencyImageNames().entrySet().stream()) |
There was a problem hiding this comment.
It's also hard to read this part because you have no idea what dependencyImageNames is and what does that flatmap do.
There was a problem hiding this comment.
Reimplemented this part without stream
vcvitaly
reviewed
Mar 10, 2021
| @@ -76,27 +77,43 @@ public void shouldIgnoreUnknownStructure() { | |||
| public void shouldObtainImageNamesV1() { | |||
| File file = new File("src/test/resources/docker-compose-imagename-parsing-v1.yml"); | |||
| ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file); | |||
| assertEquals("all defined images are found", Sets.newHashSet("redis", "mysql", "postgres"), parsedFile.getDependencyImageNames()); // redis, mysql from compose file, postgres from Dockerfile build | |||
| Assertions.assertThat(parsedFile.getDependencyImageNames()) | |||
There was a problem hiding this comment.
Formatting it so that each entry starts at the new line might improve readability.
…compose files were given
rnorth
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #2782