From b7c28b488f903ab87641441b6a8f36c8b432e4dc Mon Sep 17 00:00:00 2001 From: loikg Date: Sat, 15 Mar 2025 13:09:54 +0800 Subject: [PATCH 1/3] feat: make repear wait strategy compatible with new ryuk version --- packages/testcontainers/src/reaper/reaper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/testcontainers/src/reaper/reaper.ts b/packages/testcontainers/src/reaper/reaper.ts index 47d063604..686331295 100644 --- a/packages/testcontainers/src/reaper/reaper.ts +++ b/packages/testcontainers/src/reaper/reaper.ts @@ -75,7 +75,7 @@ async function createNewReaper(sessionId: string, remoteSocketPath: string): Pro ) .withBindMounts([{ source: remoteSocketPath, target: "/var/run/docker.sock" }]) .withLabels({ [LABEL_TESTCONTAINERS_SESSION_ID]: sessionId }) - .withWaitStrategy(Wait.forLogMessage(/.+ Started!/)); + .withWaitStrategy(Wait.forLogMessage(/.*Started.*/)); if (process.env.TESTCONTAINERS_RYUK_PRIVILEGED === "true") { container.withPrivilegedMode(); From 1827dfe2e07207e6733923228b3bf38ae650922a Mon Sep 17 00:00:00 2001 From: loikg Date: Mon, 17 Mar 2025 06:39:16 +0800 Subject: [PATCH 2/3] feat: bump ryuk image version to 0.11.0 --- packages/testcontainers/src/reaper/reaper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/testcontainers/src/reaper/reaper.ts b/packages/testcontainers/src/reaper/reaper.ts index 686331295..0405c133b 100644 --- a/packages/testcontainers/src/reaper/reaper.ts +++ b/packages/testcontainers/src/reaper/reaper.ts @@ -8,7 +8,7 @@ import { Wait } from "../wait-strategies/wait"; export const REAPER_IMAGE = process.env["RYUK_CONTAINER_IMAGE"] ? ImageName.fromString(process.env["RYUK_CONTAINER_IMAGE"]).string - : ImageName.fromString("testcontainers/ryuk:0.5.1").string; + : ImageName.fromString("testcontainers/ryuk:0.11.0").string; export interface Reaper { sessionId: string; From a6b71c05ef4a34b7ae6667940050cb0ffc731c63 Mon Sep 17 00:00:00 2001 From: loikg Date: Tue, 18 Mar 2025 06:10:13 +0800 Subject: [PATCH 3/3] docs: update RYUK_CONTAINER_IMAGE default value in docs --- docs/configuration.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index 10e7eae14..0974f3692 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -32,15 +32,15 @@ Configuration of the Docker daemon: Configuration of Testcontainers and its behaviours: -| Variable | Example | Description | -| ------------------------------------- | ------------------------- | ---------------------------------------- | -| TESTCONTAINERS_HOST_OVERRIDE | tcp://docker:2375 | Docker's host on which ports are exposed | -| TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE | /var/run/docker.sock | Path to Docker's socket used by ryuk | -| TESTCONTAINERS_RYUK_PRIVILEGED | true | Run ryuk as a privileged container | -| TESTCONTAINERS_RYUK_DISABLED | true | Disable ryuk | -| TESTCONTAINERS_RYUK_PORT | 65515 | Set ryuk host port (not recommended) | -| TESTCONTAINERS_SSHD_PORT | 65515 | Set SSHd host port (not recommended) | -| TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX | mycompany.com/registry | Set default image registry | -| RYUK_CONTAINER_IMAGE | testcontainers/ryuk:0.5.1 | Custom image for ryuk | -| SSHD_CONTAINER_IMAGE | testcontainers/sshd:1.1.0 | Custom image for SSHd | -| TESTCONTAINERS_REUSE_ENABLE | true | Enable reusable containers | +| Variable | Example | Description | +| ------------------------------------- | -------------------------- | ---------------------------------------- | +| TESTCONTAINERS_HOST_OVERRIDE | tcp://docker:2375 | Docker's host on which ports are exposed | +| TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE | /var/run/docker.sock | Path to Docker's socket used by ryuk | +| TESTCONTAINERS_RYUK_PRIVILEGED | true | Run ryuk as a privileged container | +| TESTCONTAINERS_RYUK_DISABLED | true | Disable ryuk | +| TESTCONTAINERS_RYUK_PORT | 65515 | Set ryuk host port (not recommended) | +| TESTCONTAINERS_SSHD_PORT | 65515 | Set SSHd host port (not recommended) | +| TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX | mycompany.com/registry | Set default image registry | +| RYUK_CONTAINER_IMAGE | testcontainers/ryuk:0.11.0 | Custom image for ryuk | +| SSHD_CONTAINER_IMAGE | testcontainers/sshd:1.1.0 | Custom image for SSHd | +| TESTCONTAINERS_REUSE_ENABLE | true | Enable reusable containers |