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

Parse docker compose file correctly when version is not declared #9420

Merged
merged 1 commit into from
Oct 21, 2024
Merged

Parse docker compose file correctly when version is not declared #9420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,16 @@ protected Object constructObject(Node node) {

private void parseAndValidate() {
final Map<String, ?> servicesMap;
if (composeFileContent.containsKey("version")) {
if ("2.0".equals(composeFileContent.get("version"))) {
log.warn(
"Testcontainers may not be able to clean up networks spawned using Docker Compose v2.0 files. " +
"Please see https://github.com/testcontainers/moby-ryuk/issues/2, and specify 'version: \"2.1\"' or " +
"higher in {}",
composeFileName
);
}
if (composeFileContent.containsKey("version") && "2.0".equals(composeFileContent.get("version"))) {
log.warn(
"Testcontainers may not be able to clean up networks spawned using Docker Compose v2.0 files. " +
"Please see https://github.com/testcontainers/moby-ryuk/issues/2, and specify 'version: \"2.1\"' or " +
"higher in {}",
composeFileName
);
}

if (composeFileContent.containsKey("services")) {
final Object servicesElement = composeFileContent.get("services");
if (servicesElement == null) {
log.debug(
Expand Down
13 changes: 13 additions & 0 deletions core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,19 @@ public void shouldObtainImageNamesV2() {
);
}

@Test
public void shouldObtainImageNamesV2WithNoVersionTag() {
File file = new File("src/test/resources/docker-compose-imagename-parsing-v2-no-version.yml");
ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
assertThat(parsedFile.getServiceNameToImageNames())
.as("all defined images are found")
.contains(
entry("mysql", Sets.newHashSet("mysql")),
entry("redis", Sets.newHashSet("redis")),
entry("custom", Sets.newHashSet("postgres"))
);
}

@Test
public void shouldObtainImageFromDockerfileBuild() {
File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile.yml");
Expand Down
9 changes: 9 additions & 0 deletions core/src/test/resources/docker-compose-imagename-parsing-v2-no-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
services:
redis:
image: redis
mysql:
image: mysql
custom:
build: .
networks:
custom_network: {}
Loading