Skip to content

Commit 2dd3b3d

Browse files
committed
do not update the default image
1 parent 30fafdf commit 2dd3b3d

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
@@ -62,7 +62,7 @@ public class ComposeContainer extends FailureDetectingExternalResource implement
6262

6363
public static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker.exe" : "docker";
6464

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

6767
private final ComposeDelegate composeDelegate;
6868

@@ -94,7 +94,7 @@ public ComposeContainer(DockerImageName image, String identifier, List<File> com
9494
*/
9595
@Deprecated
9696
public ComposeContainer(File... composeFiles) {
97-
this(getDockerImageName(), Arrays.asList(composeFiles));
97+
this(DEFAULT_IMAGE_NAME, Arrays.asList(composeFiles));
9898
}
9999

100100
/**
@@ -103,7 +103,7 @@ public ComposeContainer(File... composeFiles) {
103103
*/
104104
@Deprecated
105105
public ComposeContainer(List<File> composeFiles) {
106-
this(getDockerImageName(), composeFiles);
106+
this(DEFAULT_IMAGE_NAME, composeFiles);
107107
}
108108

109109
/**
@@ -112,7 +112,7 @@ public ComposeContainer(List<File> composeFiles) {
112112
*/
113113
@Deprecated
114114
public ComposeContainer(String identifier, File... composeFiles) {
115-
this(getDockerImageName(), identifier, Arrays.asList(composeFiles));
115+
this(DEFAULT_IMAGE_NAME, identifier, Arrays.asList(composeFiles));
116116
}
117117

118118
/**
@@ -121,15 +121,7 @@ public ComposeContainer(String identifier, File... composeFiles) {
121121
*/
122122
@Deprecated
123123
public ComposeContainer(String identifier, List<File> composeFiles) {
124-
this(getDockerImageName(), identifier, composeFiles);
125-
}
126-
127-
public static DockerImageName getDockerImageName() {
128-
return DockerImageName.parse(
129-
TestcontainersConfiguration
130-
.getInstance()
131-
.getEnvVarOrUserProperty("compose.container.image", DEFAULT_DOCKER_IMAGE)
132-
);
124+
this(DEFAULT_IMAGE_NAME, identifier, composeFiles);
133125
}
134126

135127
@Override

0 commit comments

Comments
 (0)