Update alpine image version to 3.17 (#8476)

Fixes #8430
testcontainers · Mar 22, 2024 · a52eadb · a52eadb
1 parent 021c71f
commit a52eadb
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 30 deletions.
diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -77,7 +77,7 @@ static Map<String, String> markerLabels() {
         return Collections.unmodifiableMap(labels);
     }
 
-    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16");
+    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
 
     private static DockerClientFactory instance;
 

diff --git a/core/src/test/java/org/testcontainers/TestImages.java b/core/src/test/java/org/testcontainers/TestImages.java
@@ -6,7 +6,7 @@ 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 ALPINE_IMAGE = DockerImageName.parse("alpine:3.16");
+    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.16");
+    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
@@ -27,6 +27,6 @@ public void shouldGetDependencyImagesWhenOverriding() {
             )
         );
         assertThat(dockerComposeFiles.getDependencyImages())
-            .containsExactlyInAnyOrder("alpine:3.16", "redis:b", "mysql:b", "aservice:latest");
+            .containsExactlyInAnyOrder("alpine:3.17", "redis:b", "mysql:b", "aservice:latest");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -229,7 +229,7 @@ public void shouldReturnTheProvidedImage() {
         GenericContainer container = new GenericContainer(TestImages.REDIS_IMAGE);
         assertThat(container.getImage().get()).isEqualTo("redis:3.0.2");
         container.setImage(new RemoteDockerImage(TestImages.ALPINE_IMAGE));
-        assertThat(container.getImage().get()).isEqualTo("alpine:3.16");
+        assertThat(container.getImage().get()).isEqualTo("alpine:3.17");
     }
 
     @Test

diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -113,8 +113,8 @@ public void shouldObtainImageFromDockerfileBuild() {
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.16"))
-            ); // r/ redis, mysql from compose file, alpine:3.16 from Dockerfile build
+                entry("custom", Sets.newHashSet("alpine:3.17"))
+            ); // r/ redis, mysql from compose file, alpine:3.17 from Dockerfile build
     }
 
     @Test
@@ -126,7 +126,7 @@ public void shouldObtainImageFromDockerfileBuildWithContext() {
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.16"))
-            ); // redis, mysql from compose file, alpine:3.16 from Dockerfile build
+                entry("custom", Sets.newHashSet("alpine:3.17"))
+            ); // redis, mysql from compose file, alpine:3.17 from Dockerfile build
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
@@ -23,7 +23,7 @@ public class ToStringConsumerTest {
 
     @Test
     public void newlines_are_not_added_to_exec_output() throws Exception {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCommand("sleep", "2m");
             container.start();
 
@@ -34,7 +34,7 @@ public void newlines_are_not_added_to_exec_output() throws Exception {
 
     @Test(timeout = 60_000L)
     public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCreateContainerCmdModifier(cmd -> {
                 cmd.withAttachStdin(true).withStdinOpen(true).withTty(true);
             });
@@ -48,7 +48,7 @@ public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
 
     @Test
     public void newlines_are_not_added_to_container_output() {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCommand("echo", "-n", LARGE_PAYLOAD);
             container.setStartupCheckStrategy(new OneShotStartupCheckStrategy());
             container.start();
@@ -61,7 +61,7 @@ public void newlines_are_not_added_to_container_output() {
 
     @Test
     public void newlines_are_not_added_to_container_output_with_tty() {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCreateContainerCmdModifier(cmd -> {
                 cmd.withTty(true);
             });

diff --git a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
@@ -16,7 +16,7 @@ public class ImagePullTest {
     public static String[] parameters() {
         return new String[] {
             "alpine:latest",
-            "alpine:3.16",
+            "alpine:3.17",
             "alpine", // omitting the tag should work and default to latest
             "alpine@sha256:1775bebec23e1f3ce486989bfc9ff3c4e951690df84aa9f926497d82f2ffca9d",
             "quay.io/testcontainers/ryuk:latest",

diff --git a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
@@ -38,7 +38,7 @@ protected void configure(BuildImageCmd buildImageCmd) {
                 super.configure(buildImageCmd);
 
                 List<String> dockerfile = Arrays.asList(
-                    "FROM alpine:3.16",
+                    "FROM alpine:3.17",
                     "RUN echo 'hello from Docker build process'",
                     "CMD yes"
                 );
@@ -58,7 +58,7 @@ public void dockerfileBuilderWorks() {
             .withFileFromString("folder/someFile.txt", "hello")
             .withDockerfileFromBuilder(builder -> {
                 builder
-                    .from("alpine:3.16")
+                    .from("alpine:3.17")
                     .workDir("/app")
                     .add("test.txt", "test file.txt")
                     .run("ls", "-la", "/app/test file.txt")
@@ -101,7 +101,7 @@ public int getFileMode() {
             )
             .withDockerfileFromBuilder(builder -> {
                 builder
-                    .from("alpine:3.16") //
+                    .from("alpine:3.17") //
                     .copy("someFile.txt", "/someFile.txt")
                     .cmd("stat -c \"%a\" /someFile.txt");
             });

diff --git a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
@@ -23,7 +23,7 @@
  */
 public class FixedHostPortContainerTest {
 
-    private static final String TEST_IMAGE = "alpine:3.16";
+    private static final String TEST_IMAGE = "alpine:3.17";
 
     /**
      * Default http server port (just something different from default)

diff --git a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
@@ -22,7 +22,7 @@ public void simpleRecursiveFileTest() {
             new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder -> {
                     builder
-                        .from("alpine:3.16")
+                        .from("alpine:3.17")
                         .copy("/tmp/foo", "/foo")
                         .cmd("cat /foo/test/resources/test-recursive-file.txt")
                         .build();
@@ -47,7 +47,7 @@ public void simpleRecursiveFileWithPermissionTest() {
                 new ImageFromDockerfile()
                     .withDockerfileFromBuilder(builder -> {
                         builder
-                            .from("alpine:3.16") //
+                            .from("alpine:3.17") //
                             .copy("/tmp/foo", "/foo")
                             .cmd("ls", "-al", "/")
                             .build();
@@ -75,7 +75,7 @@ public void simpleRecursiveClasspathResourceTest() {
                 new ImageFromDockerfile()
                     .withDockerfileFromBuilder(builder -> {
                         builder
-                            .from("alpine:3.16") //
+                            .from("alpine:3.17") //
                             .copy("/tmp/foo", "/foo")
                             .cmd("ls -lRt /foo")
                             .build();

diff --git a/core/src/test/resources/compose-dockerfile/Dockerfile b/core/src/test/resources/compose-dockerfile/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.17
 
 ADD passthrough.sh /passthrough.sh
 

diff --git a/core/src/test/resources/compose-scaling-multiple-containers.yml b/core/src/test/resources/compose-scaling-multiple-containers.yml
@@ -3,5 +3,5 @@ services:
   redis:
     image: redis
   other:
-    image: alpine:3.16
+    image: alpine:3.17
     command: sleep 10000
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
@@ -20,7 +20,7 @@ public class ContainerCreationTest {
     // }
     // spotless:on
 
-    public static final DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.16");
+    public static final DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.17");
 
     // spotless:off
     // withOptions {

diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
@@ -9,15 +9,15 @@
 public class ContainerLabelTest {
 
     // single_label {
-    public GenericContainer containerWithLabel = new GenericContainer(DockerImageName.parse("alpine:3.16"))
+    public GenericContainer containerWithLabel = new GenericContainer(DockerImageName.parse("alpine:3.17"))
         .withLabel("key", "value");
     // }
 
     // multiple_labels {
     private Map<String, String> mapOfLabels = new HashMap<>();
     // populate map, e.g. mapOfLabels.put("key1", "value1");
 
-    public GenericContainer containerWithMultipleLabels = new GenericContainer(DockerImageName.parse("alpine:3.16"))
+    public GenericContainer containerWithMultipleLabels = new GenericContainer(DockerImageName.parse("alpine:3.17"))
         .withLabels(mapOfLabels);
     // }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
@@ -13,7 +13,7 @@
 public class ExecTest {
 
     @Rule
-    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine:3.16"))
+    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine:3.17"))
         .withCommand("top");
 
     @Test

diff --git a/docs/features/configuration.md b/docs/features/configuration.md
@@ -49,7 +49,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **ryuk.container.image = testcontainers/ryuk:0.3.3**
 > Performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](#disabling-ryuk))
 
-> **tinyimage.container.image = alpine:3.16**  
+> **tinyimage.container.image = alpine:3.17**  
 > Used to check whether images can be pulled at startup, and always required (unless [startup checks are disabled](#disabling-the-startup-checks))
 
 > **sshd.container.image = testcontainers/sshd:1.1.0**  

diff --git a/docs/features/creating_images.md b/docs/features/creating_images.md
@@ -51,7 +51,7 @@ new GenericContainer(
         new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder ->
                         builder
-                                .from("alpine:3.16")
+                                .from("alpine:3.17")
                                 .run("apk add --update nginx")
                                 .cmd("nginx", "-g", "daemon off;")
                                 .build()))

diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
@@ -6,5 +6,5 @@ interface SpockTestImages {
 	DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:8.0.36")
 	DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12")
 	DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine")
-	DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16")
+	DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17")
 }