Skip to content

Commit fa499d9

Browse files
committed
Update tiny image from alpine:3.17 to alpine:3.24
1 parent 2ac3c97 commit fa499d9

18 files changed

Lines changed: 31 additions & 31 deletions

File tree

core/src/main/java/org/testcontainers/DockerClientFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static Map<String, String> markerLabels() {
7979
return Collections.unmodifiableMap(labels);
8080
}
8181

82-
private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
82+
private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.24");
8383

8484
private static DockerClientFactory instance;
8585

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ public interface TestImages {
99

1010
DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:4.4");
1111

12-
DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.17");
12+
DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.24");
1313

1414
DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
1515

16-
DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
16+
DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.24");
1717
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ void shouldGetDependencyImagesWhenOverriding() {
2727
)
2828
);
2929
assertThat(dockerComposeFiles.getDependencyImages())
30-
.containsExactlyInAnyOrder("alpine:3.17", "redis:b", "mysql:b", "aservice:latest");
30+
.containsExactlyInAnyOrder("alpine:3.24", "redis:b", "mysql:b", "aservice:latest");
3131
}
3232
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ void shouldReturnTheProvidedImage() {
237237
GenericContainer container = new GenericContainer(TestImages.REDIS_IMAGE);
238238
assertThat(container.getImage().get()).isEqualTo("redis:6-alpine");
239239
container.setImage(new RemoteDockerImage(TestImages.ALPINE_IMAGE));
240-
assertThat(container.getImage().get()).isEqualTo("alpine:3.17");
240+
assertThat(container.getImage().get()).isEqualTo("alpine:3.24");
241241
}
242242

243243
@Test
@@ -301,7 +301,7 @@ private static Optional<String> reportLeakedContainers() {
301301

302302
List<Container> containers = dockerClient
303303
.listContainersCmd()
304-
.withAncestorFilter(Collections.singletonList("alpine:3.17"))
304+
.withAncestorFilter(Collections.singletonList("alpine:3.24"))
305305
.withLabelFilter(
306306
Arrays.asList(
307307
DockerClientFactory.TESTCONTAINERS_SESSION_ID_LABEL + "=" + DockerClientFactory.SESSION_ID,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ void shouldObtainImageFromDockerfileBuild() {
133133
.contains(
134134
entry("mysql", Sets.newHashSet("mysql")),
135135
entry("redis", Sets.newHashSet("redis")),
136-
entry("custom", Sets.newHashSet("alpine:3.17"))
137-
); // r/ redis, mysql from compose file, alpine:3.17 from Dockerfile build
136+
entry("custom", Sets.newHashSet("alpine:3.24"))
137+
); // r/ redis, mysql from compose file, alpine:3.24 from Dockerfile build
138138
}
139139

140140
@Test
@@ -146,8 +146,8 @@ void shouldObtainImageFromDockerfileBuildWithContext() {
146146
.contains(
147147
entry("mysql", Sets.newHashSet("mysql")),
148148
entry("redis", Sets.newHashSet("redis")),
149-
entry("custom", Sets.newHashSet("alpine:3.17"))
150-
); // redis, mysql from compose file, alpine:3.17 from Dockerfile build
149+
entry("custom", Sets.newHashSet("alpine:3.24"))
150+
); // redis, mysql from compose file, alpine:3.24 from Dockerfile build
151151
}
152152

153153
@Test

core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class ToStringConsumerTest {
2424

2525
@Test
2626
void newlines_are_not_added_to_exec_output() throws Exception {
27-
try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
27+
try (GenericContainer<?> container = new GenericContainer<>("alpine:3.24")) {
2828
container.withCommand("sleep", "2m");
2929
container.start();
3030

@@ -36,7 +36,7 @@ void newlines_are_not_added_to_exec_output() throws Exception {
3636
@Test
3737
@Timeout(60)
3838
void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
39-
try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
39+
try (GenericContainer<?> container = new GenericContainer<>("alpine:3.24")) {
4040
container.withCreateContainerCmdModifier(cmd -> {
4141
cmd.withAttachStdin(true).withStdinOpen(true).withTty(true);
4242
});
@@ -50,7 +50,7 @@ void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
5050

5151
@Test
5252
void newlines_are_not_added_to_container_output() {
53-
try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
53+
try (GenericContainer<?> container = new GenericContainer<>("alpine:3.24")) {
5454
container.withCommand("echo", "-n", LARGE_PAYLOAD);
5555
container.setStartupCheckStrategy(new OneShotStartupCheckStrategy());
5656
container.start();
@@ -63,7 +63,7 @@ void newlines_are_not_added_to_container_output() {
6363

6464
@Test
6565
void newlines_are_not_added_to_container_output_with_tty() {
66-
try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
66+
try (GenericContainer<?> container = new GenericContainer<>("alpine:3.24")) {
6767
container.withCreateContainerCmdModifier(cmd -> {
6868
cmd.withTty(true);
6969
});

core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ImagePullTest {
1111
public static String[] parameters() {
1212
return new String[] {
1313
"alpine:latest",
14-
"alpine:3.17",
14+
"alpine:3.24",
1515
"alpine", // omitting the tag should work and default to latest
1616
"alpine@sha256:1775bebec23e1f3ce486989bfc9ff3c4e951690df84aa9f926497d82f2ffca9d",
1717
"docker.io/testcontainers/ryuk:latest",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected void configure(BuildImageCmd buildImageCmd) {
3838
super.configure(buildImageCmd);
3939

4040
List<String> dockerfile = Arrays.asList(
41-
"FROM alpine:3.17",
41+
"FROM alpine:3.24",
4242
"RUN echo 'hello from Docker build process'",
4343
"CMD yes"
4444
);
@@ -58,7 +58,7 @@ void dockerfileBuilderWorks() {
5858
.withFileFromString("folder/someFile.txt", "hello")
5959
.withDockerfileFromBuilder(builder -> {
6060
builder
61-
.from("alpine:3.17")
61+
.from("alpine:3.24")
6262
.workDir("/app")
6363
.add("test.txt", "test file.txt")
6464
.run("ls", "-la", "/app/test file.txt")
@@ -101,7 +101,7 @@ public int getFileMode() {
101101
)
102102
.withDockerfileFromBuilder(builder -> {
103103
builder
104-
.from("alpine:3.17") //
104+
.from("alpine:3.24") //
105105
.copy("someFile.txt", "/someFile.txt")
106106
.cmd("stat -c \"%a\" /someFile.txt");
107107
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
class FixedHostPortContainerTest {
2424

25-
private static final String TEST_IMAGE = "alpine:3.17";
25+
private static final String TEST_IMAGE = "alpine:3.24";
2626

2727
/**
2828
* Default http server port (just something different from default)

core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void simpleRecursiveFileTest() {
2222
new ImageFromDockerfile()
2323
.withDockerfileFromBuilder(builder -> {
2424
builder
25-
.from("alpine:3.17")
25+
.from("alpine:3.24")
2626
.copy("/tmp/foo", "/foo")
2727
.cmd("cat /foo/test/resources/test-recursive-file.txt")
2828
.build();
@@ -47,7 +47,7 @@ void simpleRecursiveFileWithPermissionTest() {
4747
new ImageFromDockerfile()
4848
.withDockerfileFromBuilder(builder -> {
4949
builder
50-
.from("alpine:3.17") //
50+
.from("alpine:3.24") //
5151
.copy("/tmp/foo", "/foo")
5252
.cmd("ls", "-al", "/")
5353
.build();
@@ -75,7 +75,7 @@ void simpleRecursiveClasspathResourceTest() {
7575
new ImageFromDockerfile()
7676
.withDockerfileFromBuilder(builder -> {
7777
builder
78-
.from("alpine:3.17") //
78+
.from("alpine:3.24") //
7979
.copy("/tmp/foo", "/foo")
8080
.cmd("ls -lRt /foo")
8181
.build();

0 commit comments

Comments
 (0)