From 184afddf981b58497823fcfae0c51c008ad9d361 Mon Sep 17 00:00:00 2001 From: Richard North Date: Tue, 29 Dec 2020 12:44:10 +0000 Subject: [PATCH] Upgrade Ryuk to 0.3.1 (#3629) Co-authored-by: Sergei Egorov --- .../main/java/org/testcontainers/utility/ResourceReaper.java | 2 +- .../utility/TestcontainersConfigurationTest.java | 4 ++-- docs/features/configuration.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java index f409dbbc865..71a4b49d0d3 100644 --- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java +++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java @@ -88,7 +88,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.0")) + .apply(DockerImageName.parse("testcontainers/ryuk:0.3.1")) .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 ae07e2d9131..e5300bce58d 100644 --- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java +++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java @@ -160,8 +160,8 @@ public void shouldReadReuseFromEnvironment() { @Test public void shouldTrimImageNames() { - userProperties.setProperty("ryuk.container.image", " testcontainersofficial/ryuk:0.3.0 "); - assertEquals("trailing whitespace was not removed from image name property", "testcontainersofficial/ryuk:0.3.0",newConfig().getRyukImage()); + 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()); } private TestcontainersConfiguration newConfig() { diff --git a/docs/features/configuration.md b/docs/features/configuration.md index b567a8f564f..da7bbd82d60 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.0** +> **ryuk.container.image = testcontainers/ryuk:0.3.1** > Performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](#disabling-ryuk)) > **tinyimage.container.image = alpine:3.5** @@ -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.0** +> **ryuk.container.image = testcontainers/ryuk:0.3.1** > The resource reaper is responsible for container removal and automatic cleanup of dead containers at JVM shutdown > **ryuk.container.privileged = false**