diff --git a/core/src/test/java/org/testcontainers/TestImages.java b/core/src/test/java/org/testcontainers/TestImages.java index 21511a0d72f..d8209e29507 100644 --- a/core/src/test/java/org/testcontainers/TestImages.java +++ b/core/src/test/java/org/testcontainers/TestImages.java @@ -3,9 +3,9 @@ import org.testcontainers.utility.DockerImageName; public interface TestImages { - DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2"); - DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.5.3"); - DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:3.1.5"); + DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:6-alpine"); + DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.7.25"); + DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:4.4"); DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.17"); DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0"); DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17"); diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java index 56a70e83c46..a5b7fe15441 100644 --- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java +++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java @@ -227,7 +227,7 @@ public void testArchitectureCheck() { @Test public void shouldReturnTheProvidedImage() { GenericContainer container = new GenericContainer(TestImages.REDIS_IMAGE); - assertThat(container.getImage().get()).isEqualTo("redis:3.0.2"); + assertThat(container.getImage().get()).isEqualTo("redis:6-alpine"); container.setImage(new RemoteDockerImage(TestImages.ALPINE_IMAGE)); assertThat(container.getImage().get()).isEqualTo("alpine:3.17"); } diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java index dd2054e1e2e..69b674bca71 100644 --- a/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java +++ b/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java @@ -12,7 +12,7 @@ public class DockerComposeLocalImageTest { @Test public void usesLocalImageEvenWhenPullFails() throws InterruptedException { - tagImage("redis:4.0.10", "redis-local", "latest"); + tagImage("redis:6-alpine", "redis-local", "latest"); DockerComposeContainer composeContainer = new DockerComposeContainer( new File("src/test/resources/local-compose-test.yml") diff --git a/core/src/test/resources/compose-options-test/with-deploy-block.yml b/core/src/test/resources/compose-options-test/with-deploy-block.yml index f52f6747122..b80c8677fb8 100644 --- a/core/src/test/resources/compose-options-test/with-deploy-block.yml +++ b/core/src/test/resources/compose-options-test/with-deploy-block.yml @@ -1,7 +1,7 @@ version: '3.7' services: redis: - image: redis:2.6.17 + image: redis:6-alpine deploy: resources: limits: diff --git a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java index a8ace490d82..52c7f621d07 100644 --- a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java +++ b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java @@ -18,7 +18,7 @@ public class CmdModifierTest { // hostname { @Rule - public GenericContainer theCache = new GenericContainer<>(DockerImageName.parse("redis:3.0.2")) + public GenericContainer theCache = new GenericContainer<>(DockerImageName.parse("redis:6-alpine")) .withCreateContainerCmdModifier(cmd -> cmd.withHostName("the-cache")); // } @@ -30,7 +30,7 @@ public class CmdModifierTest { private long memorySwapInBytes = 64l * 1024l * 1024l; @Rule - public GenericContainer memoryLimitedRedis = new GenericContainer<>(DockerImageName.parse("redis:3.0.2")) + public GenericContainer memoryLimitedRedis = new GenericContainer<>(DockerImageName.parse("redis:6-alpine")) .withCreateContainerCmdModifier(cmd -> { cmd.getHostConfig() .withMemory(memoryInBytes) diff --git a/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java b/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java index 3cab77770dc..5b4df0dbb66 100644 --- a/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java +++ b/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java @@ -11,7 +11,7 @@ public class CommandsTest { @Rule // startupCommand { - public GenericContainer redisWithCustomPort = new GenericContainer(DockerImageName.parse("redis:5.0")) + public GenericContainer redisWithCustomPort = new GenericContainer(DockerImageName.parse("redis:6-alpine")) .withCommand("redis-server --port 7777") // } .withExposedPorts(7777); diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java index 09149091c23..e202580c247 100644 --- a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java +++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java @@ -11,7 +11,7 @@ public class ContainerCreationTest { // spotless:off // simple { - public static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2"); + public static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:6-alpine"); @ClassRule public static GenericContainer redis = new GenericContainer<>(REDIS_IMAGE) diff --git a/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java b/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java index 7116f375283..d8e152fc847 100644 --- a/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java +++ b/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java @@ -10,7 +10,7 @@ public class DependsOnTest { @Rule // dependsOn { - public GenericContainer redis = new GenericContainer<>("redis:3.0.2").withExposedPorts(6379); + public GenericContainer redis = new GenericContainer<>("redis:6-alpine").withExposedPorts(6379); @Rule public GenericContainer nginx = new GenericContainer<>("nginx:1.9.4").dependsOn(redis).withExposedPorts(80); diff --git a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java index 0b2b166d1d9..7d1876be591 100644 --- a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java +++ b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java @@ -29,7 +29,7 @@ public class WaitStrategiesTest { @Rule // logMessageWait { - public GenericContainer containerWithLogWait = new GenericContainer(DockerImageName.parse("redis:5.0.3")) + public GenericContainer containerWithLogWait = new GenericContainer(DockerImageName.parse("redis:6-alpine")) .withExposedPorts(6379) .waitingFor(Wait.forLogMessage(".*Ready to accept connections.*\\n", 1)); diff --git a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java index 0f219397bdc..e4c4424315b 100644 --- a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java +++ b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java @@ -14,7 +14,7 @@ public class RedisBackedCacheIntTest { // rule { @Rule - public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine")) + public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:6-alpine")) .withExposedPorts(6379); // } diff --git a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java index 2c5f4baef67..b61763471f2 100644 --- a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java +++ b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java @@ -17,7 +17,7 @@ public class RedisBackedCacheIntTest { // container { @Container - public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine")) + public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:6-alpine")) .withExposedPorts(6379); // } diff --git a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy index 5cc04dc6b9d..407e49cc638 100644 --- a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy +++ b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy @@ -10,7 +10,7 @@ class RedisBackedCacheIntTest extends Specification { private RedisBackedCache underTest // init { - GenericContainer redis = new GenericContainer<>("redis:5.0.3-alpine") + GenericContainer redis = new GenericContainer<>("redis:6-alpine") .withExposedPorts(6379) // } diff --git a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java index 45c482c098e..0f97be3c336 100644 --- a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java +++ b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java @@ -17,7 +17,7 @@ */ public class RedisBackedCacheTest { - private static GenericContainer redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6")) + private static GenericContainer redis = new GenericContainer<>(DockerImageName.parse("redis:6-alpine")) .withExposedPorts(6379); private Cache cache; diff --git a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java index de33245eb01..970fc0a58e5 100644 --- a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java +++ b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java @@ -19,7 +19,7 @@ class RedisBackedCacheTest { @Container - public GenericContainer redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6")) + public GenericContainer redis = new GenericContainer<>(DockerImageName.parse("redis:6-alpine")) .withExposedPorts(6379); private Cache cache; diff --git a/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java b/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java index 729e9fb124d..654977d7a22 100644 --- a/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java +++ b/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java @@ -5,7 +5,7 @@ public abstract class AbstractIntegrationTest { - public static final GenericContainer redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6")) + public static final GenericContainer redis = new GenericContainer<>(DockerImageName.parse("redis:6-alpine")) .withExposedPorts(6379); static { diff --git a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt index 045899ad721..6df81f56262 100644 --- a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt +++ b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt @@ -16,7 +16,7 @@ import org.testcontainers.containers.GenericContainer abstract class AbstractIntegrationTest { companion object { - val redisContainer = GenericContainer("redis:3-alpine") + val redisContainer = GenericContainer("redis:6-alpine") .apply { withExposedPorts(6379) } } diff --git a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java index d3d1621cda1..806e63ed930 100644 --- a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java +++ b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java @@ -16,7 +16,7 @@ @ActiveProfiles("test") abstract class AbstractIntegrationTest { - static GenericContainer redis = new GenericContainer<>(DockerImageName.parse("redis:3-alpine")) + static GenericContainer redis = new GenericContainer<>(DockerImageName.parse("redis:6-alpine")) .withExposedPorts(6379); @DynamicPropertySource diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java index 0a9ec62fca2..f6ed39c483e 100644 --- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java +++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java @@ -7,7 +7,7 @@ public class RedisContainer extends GenericContainer { public RedisContainer() { - super(DockerImageName.parse("redis:3.2.11")); + super(DockerImageName.parse("redis:6-alpine")); withExposedPorts(6379); } diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java index 34068e5e49e..b3caaf4f083 100644 --- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java +++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java @@ -27,7 +27,7 @@ public class ToxiproxyTest { // The target container - this could be anything @Rule - public GenericContainer redis = new GenericContainer<>("redis:5.0.4") + public GenericContainer redis = new GenericContainer<>("redis:6-alpine") .withExposedPorts(6379) .withNetwork(network) .withNetworkAliases("redis"); @@ -114,7 +114,7 @@ public void testConnectionCut() throws IOException { @Test public void testMultipleProxiesCanBeCreated() throws IOException { try ( - GenericContainer secondRedis = new GenericContainer<>("redis:5.0.4") + GenericContainer secondRedis = new GenericContainer<>("redis:6-alpine") .withExposedPorts(6379) .withNetwork(network) .withNetworkAliases("redis2")