Skip to content

Commit 78c8674

Browse files
fokioneddumelendez
authored andcommitted
do not update the default image
1 parent 75004f6 commit 78c8674

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

core/src/main/java/org/testcontainers/containers/ComposeContainer.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class ComposeContainer implements Startable {
6060

6161
public static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker.exe" : "docker";
6262

63-
private static final String DEFAULT_DOCKER_IMAGE = "docker:27.5.0";
63+
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker:24.0.2");
6464

6565
private final ComposeDelegate composeDelegate;
6666

@@ -92,7 +92,7 @@ public ComposeContainer(DockerImageName image, String identifier, List<File> com
9292
*/
9393
@Deprecated
9494
public ComposeContainer(File... composeFiles) {
95-
this(getDockerImageName(), Arrays.asList(composeFiles));
95+
this(DEFAULT_IMAGE_NAME, Arrays.asList(composeFiles));
9696
}
9797

9898
/**
@@ -101,7 +101,7 @@ public ComposeContainer(File... composeFiles) {
101101
*/
102102
@Deprecated
103103
public ComposeContainer(List<File> composeFiles) {
104-
this(getDockerImageName(), composeFiles);
104+
this(DEFAULT_IMAGE_NAME, composeFiles);
105105
}
106106

107107
/**
@@ -110,7 +110,7 @@ public ComposeContainer(List<File> composeFiles) {
110110
*/
111111
@Deprecated
112112
public ComposeContainer(String identifier, File... composeFiles) {
113-
this(getDockerImageName(), identifier, Arrays.asList(composeFiles));
113+
this(DEFAULT_IMAGE_NAME, identifier, Arrays.asList(composeFiles));
114114
}
115115

116116
/**
@@ -119,15 +119,7 @@ public ComposeContainer(String identifier, File... composeFiles) {
119119
*/
120120
@Deprecated
121121
public ComposeContainer(String identifier, List<File> composeFiles) {
122-
this(getDockerImageName(), identifier, composeFiles);
123-
}
124-
125-
public static DockerImageName getDockerImageName() {
126-
return DockerImageName.parse(
127-
TestcontainersConfiguration
128-
.getInstance()
129-
.getEnvVarOrUserProperty("compose.container.image", DEFAULT_DOCKER_IMAGE)
130-
);
122+
this(DEFAULT_IMAGE_NAME, identifier, composeFiles);
131123
}
132124

133125
@Override

0 commit comments

Comments
 (0)