diff --git a/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java index 8b3b3fa8fa5..0e921316bf3 100644 --- a/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java +++ b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java @@ -31,7 +31,7 @@ class ComposeContainerWithServicesTest { @Test void testDesiredSubsetOfServicesAreStarted() { try ( - ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE) + ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), SIMPLE_COMPOSE_FILE) .withServices("redis") ) { compose.start(); @@ -43,7 +43,7 @@ void testDesiredSubsetOfServicesAreStarted() { @Test void testDesiredSubsetOfScaledServicesAreStarted() { try ( - ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE) + ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), SIMPLE_COMPOSE_FILE) .withScaledService("redis", 2) ) { compose.start(); @@ -55,7 +55,7 @@ void testDesiredSubsetOfScaledServicesAreStarted() { @Test void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() { try ( - ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE) + ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), SIMPLE_COMPOSE_FILE) .withServices("redis") .withScaledService("redis", 2) ) { @@ -68,7 +68,7 @@ void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() { @Test void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() { try ( - ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE) + ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), SIMPLE_COMPOSE_FILE) .withServices("other") .withScaledService("redis", 2) ) { @@ -81,7 +81,7 @@ void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() { @Test void testAllServicesAreStartedIfNotSpecified() { try ( - ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE) + ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), SIMPLE_COMPOSE_FILE) ) { compose.start(); @@ -93,7 +93,7 @@ void testAllServicesAreStartedIfNotSpecified() { void testScaleInComposeFileIsRespected() { try ( ComposeContainer compose = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), COMPOSE_FILE_WITH_INLINE_SCALE ) ) { @@ -110,7 +110,7 @@ void testStartupTimeoutSetsTheHighestTimeout() { catchThrowable(() -> { try ( ComposeContainer compose = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), SIMPLE_COMPOSE_FILE ) .withServices("redis") @@ -133,7 +133,7 @@ void testStartupTimeoutSetsTheHighestTimeout() { void testWaitingForHealthcheck() { try ( ComposeContainer compose = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), COMPOSE_FILE_WITH_HEALTHCHECK ) .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(2))) @@ -148,7 +148,7 @@ void testWaitingForHealthcheck() { void testWaitingForHealthcheckWithRestartDoesNotCrash() { try ( ComposeContainer compose = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), COMPOSE_FILE_WITH_HEALTHCHECK ) .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(1))) diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java index 028d883b320..bf38af0f929 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java @@ -19,7 +19,7 @@ class ComposeContainerOverrideTest { @Test void readEnvironment() { try ( - ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), BASE) + ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), BASE) .withExposedService("redis", 6379) ) { compose.start(); @@ -34,7 +34,7 @@ void readEnvironment() { @Test void resetEnvironment() { try ( - ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), BASE, OVERRIDE) + ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), BASE, OVERRIDE) .withExposedService("redis", 6379) ) { compose.start(); diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java index b45db1a4f8a..f0a8873f8f3 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java @@ -10,7 +10,7 @@ class ComposeContainerPortViaEnvTest extends BaseComposeTest { @AutoClose public ComposeContainer environment = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/v2-compose-test-port-via-env.yml") ) .withExposedService("redis-1", REDIS_PORT) diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java index 50c6ef062ef..3ef559bcda3 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java @@ -27,7 +27,7 @@ public static void checkVersion() { @AutoClose public ComposeContainer environment = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/composev2/scaled-compose-test.yml") ) .withScaledService("redis", 3) diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java index 9e68c7513df..9f3299ab441 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java @@ -18,7 +18,7 @@ class ComposeContainerTest extends BaseComposeTest { // composeContainerConstructor { public ComposeContainer environment = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/composev2/compose-test.yml") ) .withExposedService("redis-1", REDIS_PORT) @@ -88,7 +88,7 @@ void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOException { Files.write(filePathNotStartWithDotSlash.toPath(), validYaml.getBytes(StandardCharsets.UTF_8)); final ComposeContainer dockerComposeContainer = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), filePathNotStartWithDotSlash ); assertThat(dockerComposeContainer).as("Container created using docker compose file").isNotNull(); diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java index cebfc2a9706..d194204078f 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java @@ -29,7 +29,7 @@ void performTest(boolean removeVolumes, boolean shouldVolumesBePresentAfterRunni final AtomicReference volumeName = new AtomicReference<>(""); try ( - ComposeContainer environment = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), composeFile) + ComposeContainer environment = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), composeFile) .withExposedService("redis", 6379) .withRemoveVolumes(removeVolumes) .withRemoveImages(ComposeContainer.RemoveImages.ALL) diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java index 454dae985be..714767914a0 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java @@ -39,7 +39,7 @@ void performTest( final AtomicReference builtImageName = new AtomicReference<>(""); final AtomicReference pulledImageName = new AtomicReference<>(""); try ( - ComposeContainer environment = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), composeFile) + ComposeContainer environment = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), composeFile) .withExposedService("customredis", 6379) .withBuild(true) .withRemoveImages(removeMode) diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java index cc9c2dad594..3568550ca38 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java @@ -18,7 +18,7 @@ class ComposeContainerWithCopyFilesTest { void testShouldCopyAllFilesByDefault() throws IOException { try ( ComposeContainer environment = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/compose-file-copy-inclusions/compose.yml") ) .withExposedService("app", 8080) @@ -34,7 +34,7 @@ void testShouldCopyAllFilesByDefault() throws IOException { void testWithFileCopyInclusionUsingFilePath() throws IOException { try ( ComposeContainer environment = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/compose-file-copy-inclusions/compose-root-only.yml") ) .withExposedService("app", 8080) @@ -54,7 +54,7 @@ void testWithFileCopyInclusionUsingDirectoryPath() throws IOException { try ( // composeContainerWithCopyFiles { ComposeContainer environment = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml") ) .withExposedService("app", 8080) @@ -73,7 +73,7 @@ void testWithFileCopyInclusionUsingDirectoryPath() throws IOException { void testShouldNotBeAbleToStartIfNeededEnvFileIsNotCopied() { try ( ComposeContainer environment = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml") ) .withExposedService("app", 8080) diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java index 07ce8e41ef1..3330b302ed3 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java @@ -19,7 +19,7 @@ void testComposeContainerConstructor() { try ( // composeContainerWithCombinedWaitStrategies { ComposeContainer compose = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/composev2/compose-test.yml") ) .withExposedService("redis-1", REDIS_PORT, Wait.forSuccessfulCommand("redis-cli ping")) @@ -36,7 +36,7 @@ void testComposeContainerWaitForPortWithTimeout() { try ( // composeContainerWaitForPortWithTimeout { ComposeContainer compose = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/composev2/compose-test.yml") ) .withExposedService( diff --git a/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java b/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java index acabcaf9e87..df4338ec236 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java @@ -16,7 +16,7 @@ void simpleTest() { assertThat( catchThrowable(() -> { ComposeContainer environment = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/invalid-compose.yml") ) .withExposedService("something", 123); diff --git a/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java b/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java index 7bc47d79c9d..38d0139c1cc 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java @@ -27,7 +27,7 @@ public static void checkVersion() { @AutoClose public ComposeContainer compose = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/v2-compose-test-passthrough.yml") ) .withEnv("foo", "bar") diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java index 2bec1aec819..371c70dafac 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java @@ -26,7 +26,7 @@ class ComposeWaitStrategyTest { public final void setUp() { environment = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/composev2/compose-test.yml") ); } diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java index c02b9874126..0a5c0b868c8 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java @@ -10,7 +10,7 @@ class ComposeWithIdentifierTest extends BaseComposeTest { @AutoClose public ComposeContainer environment = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), "TEST", new File("src/test/resources/v2-compose-test.yml") ) diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java index 1003c3d5404..9fdf55a83a1 100644 --- a/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java +++ b/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java @@ -10,7 +10,7 @@ class ComposeWithNetworkTest extends BaseComposeTest { @AutoClose public ComposeContainer environment = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/v2-compose-test-with-network.yml") ) .withExposedService("redis-1", REDIS_PORT); diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy index a190f1ea3b6..89de5aed88d 100644 --- a/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy +++ b/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy @@ -11,7 +11,7 @@ import spock.lang.Specification class ComposeContainerIT extends Specification { ComposeContainer composeContainer = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/docker-compose.yml")) .withExposedService("whoami-1", 80, Wait.forHttp("/")) diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy index 020005f923f..dc71687011f 100644 --- a/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy +++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy @@ -13,7 +13,7 @@ class SharedComposeContainerIT extends Specification { @Shared ComposeContainer composeContainer = new ComposeContainer( - DockerImageName.parse("docker:24.0.2"), + DockerImageName.parse("docker:25.0.5"), new File("src/test/resources/docker-compose.yml")) .withExposedService("whoami-1", 80, Wait.forHttp("/"))