From c49bf372070054c51445f84c058b0279c65bebdb Mon Sep 17 00:00:00 2001 From: Richard North Date: Tue, 3 Aug 2021 10:19:02 +0100 Subject: [PATCH 1/2] Upgrade ryuk image to 0.3.2 --- .../main/java/org/testcontainers/utility/ResourceReaper.java | 2 +- .../utility/TestcontainersConfigurationTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java index 75c6e209960..ca657675da4 100644 --- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java +++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java @@ -95,7 +95,7 @@ public static String start(String hostIpAddress, DockerClient client) { @SneakyThrows(InterruptedException.class) public static String start(DockerClient client) { String ryukImage = ImageNameSubstitutor.instance() - .apply(DockerImageName.parse("testcontainers/ryuk:0.3.1")) + .apply(DockerImageName.parse("testcontainers/ryuk:0.3.2")) .asCanonicalNameString(); DockerClientFactory.instance().checkAndPullImage(client, ryukImage); diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java index ff56f62e4e4..cbb36baf580 100644 --- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java +++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java @@ -210,8 +210,8 @@ public void shouldReadReuseFromEnvironment() { @Test public void shouldTrimImageNames() { - userProperties.setProperty("ryuk.container.image", " testcontainers/ryuk:0.3.1 "); - assertEquals("trailing whitespace was not removed from image name property", "testcontainers/ryuk:0.3.1",newConfig().getRyukImage()); + userProperties.setProperty("ryuk.container.image", " testcontainers/ryuk:0.3.2 "); + assertEquals("trailing whitespace was not removed from image name property", "testcontainers/ryuk:0.3.2",newConfig().getRyukImage()); } private TestcontainersConfiguration newConfig() { From 548be5109aedc6f6e37e66588e840c66b4865723 Mon Sep 17 00:00:00 2001 From: Richard North Date: Tue, 3 Aug 2021 10:24:36 +0100 Subject: [PATCH 2/2] Upgrade ryuk image to 0.3.2 --- docs/features/configuration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/features/configuration.md b/docs/features/configuration.md index ba4487f8722..821d0cc7629 100644 --- a/docs/features/configuration.md +++ b/docs/features/configuration.md @@ -47,7 +47,7 @@ It takes a couple of seconds, but if you want to speed up your tests, you can di Testcontainers uses public Docker images to perform different actions like startup checks, VNC recording and others. Some companies disallow the usage of Docker Hub, but you can override `*.image` properties with your own images from your private registry to workaround that. -> **ryuk.container.image = testcontainers/ryuk:0.3.1** +> **ryuk.container.image = testcontainers/ryuk:0.3.2** > Performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](#disabling-ryuk)) > **tinyimage.container.image = alpine:3.14** @@ -74,7 +74,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image` ## Customizing Ryuk resource reaper -> **ryuk.container.image = testcontainers/ryuk:0.3.1** +> **ryuk.container.image = testcontainers/ryuk:0.3.2** > The resource reaper is responsible for container removal and automatic cleanup of dead containers at JVM shutdown > **ryuk.container.privileged = false**