Skip to content

Commit 18ea976

Browse files
authored
Update images using OCI format or Docker Image manifest v2, schema 2 (#8631)
* Update redis image * Update rabbitmq image * Update mongodb image
1 parent 1f291eb commit 18ea976

File tree

19 files changed

+23
-23
lines changed

19 files changed

+23
-23
lines changed

core/src/test/java/org/testcontainers/TestImages.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import org.testcontainers.utility.DockerImageName;
44

55
public interface TestImages {
6-
DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
7-
DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.5.3");
8-
DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:3.1.5");
6+
DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:6-alpine");
7+
DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.7.25");
8+
DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:4.4");
99
DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.17");
1010
DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
1111
DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");

core/src/test/java/org/testcontainers/containers/GenericContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public void testArchitectureCheck() {
227227
@Test
228228
public void shouldReturnTheProvidedImage() {
229229
GenericContainer container = new GenericContainer(TestImages.REDIS_IMAGE);
230-
assertThat(container.getImage().get()).isEqualTo("redis:3.0.2");
230+
assertThat(container.getImage().get()).isEqualTo("redis:6-alpine");
231231
container.setImage(new RemoteDockerImage(TestImages.ALPINE_IMAGE));
232232
assertThat(container.getImage().get()).isEqualTo("alpine:3.17");
233233
}

core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class DockerComposeLocalImageTest {
1212

1313
@Test
1414
public void usesLocalImageEvenWhenPullFails() throws InterruptedException {
15-
tagImage("redis:4.0.10", "redis-local", "latest");
15+
tagImage("redis:6-alpine", "redis-local", "latest");
1616

1717
DockerComposeContainer composeContainer = new DockerComposeContainer(
1818
new File("src/test/resources/local-compose-test.yml")

core/src/test/resources/compose-options-test/with-deploy-block.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.7'
22
services:
33
redis:
4-
image: redis:2.6.17
4+
image: redis:6-alpine
55
deploy:
66
resources:
77
limits:

docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class CmdModifierTest {
1818

1919
// hostname {
2020
@Rule
21-
public GenericContainer theCache = new GenericContainer<>(DockerImageName.parse("redis:3.0.2"))
21+
public GenericContainer theCache = new GenericContainer<>(DockerImageName.parse("redis:6-alpine"))
2222
.withCreateContainerCmdModifier(cmd -> cmd.withHostName("the-cache"));
2323

2424
// }
@@ -30,7 +30,7 @@ public class CmdModifierTest {
3030
private long memorySwapInBytes = 64l * 1024l * 1024l;
3131

3232
@Rule
33-
public GenericContainer memoryLimitedRedis = new GenericContainer<>(DockerImageName.parse("redis:3.0.2"))
33+
public GenericContainer memoryLimitedRedis = new GenericContainer<>(DockerImageName.parse("redis:6-alpine"))
3434
.withCreateContainerCmdModifier(cmd -> {
3535
cmd.getHostConfig()
3636
.withMemory(memoryInBytes)

docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class CommandsTest {
1111

1212
@Rule
1313
// startupCommand {
14-
public GenericContainer redisWithCustomPort = new GenericContainer(DockerImageName.parse("redis:5.0"))
14+
public GenericContainer redisWithCustomPort = new GenericContainer(DockerImageName.parse("redis:6-alpine"))
1515
.withCommand("redis-server --port 7777")
1616
// }
1717
.withExposedPorts(7777);

docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class ContainerCreationTest {
1111

1212
// spotless:off
1313
// simple {
14-
public static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
14+
public static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:6-alpine");
1515

1616
@ClassRule
1717
public static GenericContainer<?> redis = new GenericContainer<>(REDIS_IMAGE)

docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class DependsOnTest {
1010

1111
@Rule
1212
// dependsOn {
13-
public GenericContainer<?> redis = new GenericContainer<>("redis:3.0.2").withExposedPorts(6379);
13+
public GenericContainer<?> redis = new GenericContainer<>("redis:6-alpine").withExposedPorts(6379);
1414

1515
@Rule
1616
public GenericContainer<?> nginx = new GenericContainer<>("nginx:1.9.4").dependsOn(redis).withExposedPorts(80);

docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class WaitStrategiesTest {
2929

3030
@Rule
3131
// logMessageWait {
32-
public GenericContainer containerWithLogWait = new GenericContainer(DockerImageName.parse("redis:5.0.3"))
32+
public GenericContainer containerWithLogWait = new GenericContainer(DockerImageName.parse("redis:6-alpine"))
3333
.withExposedPorts(6379)
3434
.waitingFor(Wait.forLogMessage(".*Ready to accept connections.*\\n", 1));
3535

docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class RedisBackedCacheIntTest {
1414

1515
// rule {
1616
@Rule
17-
public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine"))
17+
public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:6-alpine"))
1818
.withExposedPorts(6379);
1919

2020
// }

0 commit comments

Comments
 (0)