Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade ryuk image to 0.3.2 #4359

Merged
merged 2 commits into from
Aug 3, 2021
Merged

Upgrade ryuk image to 0.3.2 #4359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c49bf37
Upgrade ryuk image to 0.3.2
rnorth Aug 3, 2021
548be51
Upgrade ryuk image to 0.3.2
rnorth Aug 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/testcontainers/utility/ResourceReaper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions docs/features/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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**
Expand All @@ -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**
Expand Down