Update alpine image to 3.16

tobiasstadler · tobiasstadler · commit d057c60fac45 · 2022-07-21T08:58:27.000+02:00
diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -60,7 +60,7 @@ public class DockerClientFactory {
 
     public static final Map<String, String> DEFAULT_LABELS = ImmutableMap.of(TESTCONTAINERS_LABEL, "true");
 
-    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14");
+    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16");
 
     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.14");
+    DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.16");
     DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
-    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14");
+    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16");
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
@@ -28,6 +28,6 @@ public void shouldGetDependencyImagesWhenOverriding() {
         );
         Assertions
             .assertThat(dockerComposeFiles.getDependencyImages())
-            .containsExactlyInAnyOrder("alpine:3.14", "redis:b", "mysql:b", "aservice:latest");
+            .containsExactlyInAnyOrder("alpine:3.16", "redis:b", "mysql:b", "aservice:latest");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -98,9 +98,9 @@ public void shouldObtainImageFromDockerfileBuild() {
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.14"))
+                entry("custom", Sets.newHashSet("alpine:3.16"))
             )
-            .as("all defined images are found"); // r/ redis, mysql from compose file, alpine:3.14 from Dockerfile build
+            .as("all defined images are found"); // r/ redis, mysql from compose file, alpine:3.16 from Dockerfile build
     }
 
     @Test
@@ -112,8 +112,8 @@ public void shouldObtainImageFromDockerfileBuildWithContext() {
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.14"))
+                entry("custom", Sets.newHashSet("alpine:3.16"))
             )
-            .as("all defined images are found"); // redis, mysql from compose file, alpine:3.14 from Dockerfile build
+            .as("all defined images are found"); // redis, mysql from compose file, alpine:3.16 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
@@ -24,7 +24,7 @@ public class ToStringConsumerTest {
 
     @Test
     public void newlines_are_not_added_to_exec_output() throws Exception {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.14")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
             container.withCommand("sleep", "2m");
             container.start();
 
@@ -35,7 +35,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.14")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
             container.withCreateContainerCmdModifier(cmd -> {
                 cmd.withAttachStdin(true).withStdinOpen(true).withTty(true);
             });
@@ -49,7 +49,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.14")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
             container.withCommand("echo", "-n", LARGE_PAYLOAD);
             container.setStartupCheckStrategy(new OneShotStartupCheckStrategy());
             container.start();
@@ -62,7 +62,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.14")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
             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.14",
+            "alpine:3.16",
             "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
@@ -40,7 +40,7 @@ protected void configure(BuildImageCmd buildImageCmd) {
                 super.configure(buildImageCmd);
 
                 List<String> dockerfile = Arrays.asList(
-                    "FROM alpine:3.14",
+                    "FROM alpine:3.16",
                     "RUN echo 'hello from Docker build process'",
                     "CMD yes"
                 );
@@ -60,7 +60,7 @@ public void dockerfileBuilderWorks() {
             .withFileFromString("folder/someFile.txt", "hello")
             .withDockerfileFromBuilder(builder -> {
                 builder
-                    .from("alpine:3.14")
+                    .from("alpine:3.16")
                     .workDir("/app")
                     .add("test.txt", "test file.txt")
                     .run("ls", "-la", "/app/test file.txt")
@@ -103,7 +103,7 @@ public int getFileMode() {
             )
             .withDockerfileFromBuilder(builder -> {
                 builder
-                    .from("alpine:3.14") //
+                    .from("alpine:3.16") //
                     .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
@@ -24,7 +24,7 @@
  */
 public class FixedHostPortContainerTest {
 
-    private static final String TEST_IMAGE = "alpine:3.14";
+    private static final String TEST_IMAGE = "alpine:3.16";
 
     /**
      * Default http server port (just something different from default)
diff --git a/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java b/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
@@ -43,6 +43,8 @@ public static Object[][] data() {
             { "alpine:3.12", "3.12" },
             { "alpine:3.13", "3.13" },
             { "alpine:3.14", "3.14" },
+            { "alpine:3.15", "3.15" },
+            { "alpine:3.16", "3.16" },
         };
     }
 
diff --git a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
@@ -27,7 +27,7 @@ public void simpleRecursiveFileTest() {
             new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder -> {
                     builder
-                        .from("alpine:3.14")
+                        .from("alpine:3.16")
                         .copy("/tmp/foo", "/foo")
                         .cmd("cat /foo/test/resources/test-recursive-file.txt")
                         .build();
@@ -52,7 +52,7 @@ public void simpleRecursiveFileWithPermissionTest() {
             new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder -> {
                     builder
-                        .from("alpine:3.14") //
+                        .from("alpine:3.16") //
                         .copy("/tmp/foo", "/foo")
                         .cmd("ls", "-al", "/")
                         .build();
@@ -79,7 +79,7 @@ public void simpleRecursiveClasspathResourceTest() {
             new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder -> {
                     builder
-                        .from("alpine:3.14") //
+                        .from("alpine:3.16") //
                         .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.14
+FROM alpine:3.16
 
 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.14
+    image: alpine:3.16
     command: sleep 10000
diff --git a/core/src/test/resources/dockerfile-build-invalid/Dockerfile b/core/src/test/resources/dockerfile-build-invalid/Dockerfile
@@ -1 +1 @@
-FROM alpine:3.14
+FROM alpine:3.16
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile b/core/src/test/resources/dockerfile-build-test/Dockerfile
@@ -1,2 +1,2 @@
-FROM alpine:3.14
+FROM alpine:3.16
 COPY localfile.txt /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-alt b/core/src/test/resources/dockerfile-build-test/Dockerfile-alt
@@ -1,2 +1,2 @@
-FROM alpine:3.14
+FROM alpine:3.16
 RUN echo "test4567" > /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg b/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg
@@ -1,3 +1,3 @@
-FROM alpine:3.14
+FROM alpine:3.16
 ARG CUSTOM_ARG
 RUN echo "${CUSTOM_ARG}" > /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir b/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir
@@ -1,2 +1,2 @@
-FROM alpine:3.14
+FROM alpine:3.16
 COPY . /
diff --git a/core/src/test/resources/health-wait-strategy-dockerfile/Dockerfile b/core/src/test/resources/health-wait-strategy-dockerfile/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.16
 
 HEALTHCHECK --interval=1s CMD test -e /testfile
 
diff --git a/core/src/test/resources/mappable-dockerfile/Dockerfile b/core/src/test/resources/mappable-dockerfile/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.16
 ADD folder/someFile.txt /someFile.txt
 RUN cat /someFile.txt
 ADD test.txt /test.txt
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.14");
+    public static final DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.16");
 
     // 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.14"))
+    public GenericContainer containerWithLabel = new GenericContainer(DockerImageName.parse("alpine:3.16"))
         .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.14"))
+    public GenericContainer containerWithMultipleLabels = new GenericContainer(DockerImageName.parse("alpine:3.16"))
         .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.14"))
+    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine:3.16"))
         .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.14**  
+> **tinyimage.container.image = alpine:3.16**  
 > 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.14")
+                                .from("alpine:3.16")
                                 .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:5.7.34")
 	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.14")
+	DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16")
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@ public void shouldGetDependencyImagesWhenOverriding() {`
`28`	`28`	`);`
`29`	`29`	`Assertions`
`30`	`30`	`.assertThat(dockerComposeFiles.getDependencyImages())`
`31`		`- .containsExactlyInAnyOrder("alpine:3.14", "redis:b", "mysql:b", "aservice:latest");`
	`31`	`+ .containsExactlyInAnyOrder("alpine:3.16", "redis:b", "mysql:b", "aservice:latest");`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,9 @@ public void shouldObtainImageFromDockerfileBuild() {`
`98`	`98`	`.contains(`
`99`	`99`	`entry("mysql", Sets.newHashSet("mysql")),`
`100`	`100`	`entry("redis", Sets.newHashSet("redis")),`
`101`		`- entry("custom", Sets.newHashSet("alpine:3.14"))`
	`101`	`+ entry("custom", Sets.newHashSet("alpine:3.16"))`
`102`	`102`	`)`
`103`		`- .as("all defined images are found"); // r/ redis, mysql from compose file, alpine:3.14 from Dockerfile build`
	`103`	`+ .as("all defined images are found"); // r/ redis, mysql from compose file, alpine:3.16 from Dockerfile build`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`@Test`
`@@ -112,8 +112,8 @@ public void shouldObtainImageFromDockerfileBuildWithContext() {`
`112`	`112`	`.contains(`
`113`	`113`	`entry("mysql", Sets.newHashSet("mysql")),`
`114`	`114`	`entry("redis", Sets.newHashSet("redis")),`
`115`		`- entry("custom", Sets.newHashSet("alpine:3.14"))`
	`115`	`+ entry("custom", Sets.newHashSet("alpine:3.16"))`
`116`	`116`	`)`
`117`		`- .as("all defined images are found"); // redis, mysql from compose file, alpine:3.14 from Dockerfile build`
	`117`	`+ .as("all defined images are found"); // redis, mysql from compose file, alpine:3.16 from Dockerfile build`
`118`	`118`	`}`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ public static Object[][] data() {`
`43`	`43`	`{ "alpine:3.12", "3.12" },`
`44`	`44`	`{ "alpine:3.13", "3.13" },`
`45`	`45`	`{ "alpine:3.14", "3.14" },`
	`46`	`+ { "alpine:3.15", "3.15" },`
	`47`	`+ { "alpine:3.16", "3.16" },`
`46`	`48`	`};`
`47`	`49`	`}`
`48`	`50`