Merge branch 'main' into issue-687

cristianrgreco · web-flow · commit 8fe8c04c4589 · 2026-05-15T17:03:10.000+01:00
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
 
   // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {
-    "ghcr.io/devcontainers/features/node:1": {
+    "ghcr.io/devcontainers/features/node:2": {
       "version": "24"
     },
     "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -107,7 +107,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [20.x, 22.x, 24.x]
+        node-version: [22.x, 24.x]
     runs-on: ubuntu-22.04
     steps:
       - name: Code checkout
@@ -143,7 +143,7 @@ jobs:
       fail-fast: false
       matrix:
         module: ${{ fromJSON(needs.detect-modules.outputs.modules) }}
-        node-version: [20.x, 22.x, 24.x]
+        node-version: [22.x, 24.x]
         container-runtime: [docker, podman]
     uses: ./.github/workflows/test-template.yml
     with:
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,19 +20,19 @@
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@eslint/json": "^1.2.0",
-    "@vitest/coverage-v8": "^4.1.4",
-    "eslint": "^10.2.1",
+    "@vitest/coverage-v8": "^4.1.5",
+    "eslint": "^10.3.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.5",
     "husky": "^9.1.7",
-    "lint-staged": "^16.4.0",
-    "npm-check-updates": "^21.0.2",
+    "lint-staged": "^17.0.4",
+    "npm-check-updates": "^22.1.1",
     "prettier": "^3.8.3",
     "prettier-plugin-organize-imports": "^4.3.0",
     "shx": "^0.4.0",
     "ts-node": "^10.9.2",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.58.2",
+    "typescript-eslint": "^8.59.2",
     "vitest": "^4.0.18"
   },
   "lint-staged": {
@@ -42,6 +42,6 @@
     ]
   },
   "engines": {
-    "node": ">= 20"
+    "node": ">= 22.22"
   }
 }
diff --git a/packages/modules/azurecosmosdb/package.json b/packages/modules/azurecosmosdb/package.json
@@ -31,7 +31,7 @@
     "build": "tsc --project tsconfig.build.json"
   },
   "devDependencies": {
-    "@azure/cosmos": "^4.9.2"
+    "@azure/cosmos": "^4.9.3"
   },
   "dependencies": {
     "testcontainers": "^11.14.0"
diff --git a/packages/modules/cassandra/package.json b/packages/modules/cassandra/package.json
@@ -32,6 +32,6 @@
     "testcontainers": "^11.14.0"
   },
   "devDependencies": {
-    "cassandra-driver": "^4.8.0"
+    "cassandra-driver": "^4.9.0"
   }
 }
diff --git a/packages/modules/chromadb/Dockerfile b/packages/modules/chromadb/Dockerfile
@@ -1,2 +1,2 @@
-FROM chromadb/chroma:1.5.8
-FROM ollama/ollama:0.21.0
+FROM chromadb/chroma:1.5.9
+FROM ollama/ollama:0.23.2
diff --git a/packages/modules/clickhouse/Dockerfile b/packages/modules/clickhouse/Dockerfile
@@ -1 +1 @@
-FROM clickhouse/clickhouse-server:26.3-alpine
+FROM clickhouse/clickhouse-server:26.4-alpine
diff --git a/packages/modules/clickhouse/package.json b/packages/modules/clickhouse/package.json
@@ -29,7 +29,7 @@
     "build": "tsc --project tsconfig.build.json"
   },
   "devDependencies": {
-    "@clickhouse/client": "^1.18.2"
+    "@clickhouse/client": "^1.18.4"
   },
   "dependencies": {
     "testcontainers": "^11.14.0"
diff --git a/packages/modules/cockroachdb/Dockerfile b/packages/modules/cockroachdb/Dockerfile
@@ -1 +1 @@
-FROM cockroachdb/cockroach:v26.1.2
+FROM cockroachdb/cockroach:v26.1.4
diff --git a/packages/modules/elasticsearch/Dockerfile b/packages/modules/elasticsearch/Dockerfile
@@ -1 +1 @@
-FROM elasticsearch:9.3.3
+FROM elasticsearch:9.4.0
diff --git a/packages/modules/elasticsearch/package.json b/packages/modules/elasticsearch/package.json
@@ -29,7 +29,7 @@
     "build": "tsc --project tsconfig.build.json"
   },
   "devDependencies": {
-    "@elastic/elasticsearch": "^9.3.4"
+    "@elastic/elasticsearch": "^9.4.0"
   },
   "dependencies": {
     "testcontainers": "^11.14.0"
diff --git a/packages/modules/etcd/Dockerfile b/packages/modules/etcd/Dockerfile
@@ -1 +1 @@
-FROM quay.io/coreos/etcd:v3.6.10
+FROM quay.io/coreos/etcd:v3.6.11
diff --git a/packages/modules/gcloud/Dockerfile b/packages/modules/gcloud/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:565.0.0-emulators
+FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:567.0.0-emulators
 FROM fsouza/fake-gcs-server:1.54.0
 FROM ghcr.io/goccy/bigquery-emulator:0.6.6
-FROM gcr.io/cloud-spanner-emulator/emulator:1.5.52
+FROM gcr.io/cloud-spanner-emulator/emulator:1.5.53
diff --git a/packages/modules/gcloud/package.json b/packages/modules/gcloud/package.json
@@ -41,13 +41,13 @@
     "testcontainers": "^11.14.0"
   },
   "devDependencies": {
-    "@google-cloud/bigquery": "^8.1.1",
-    "@google-cloud/datastore": "^10.1.0",
+    "@google-cloud/bigquery": "^8.3.0",
+    "@google-cloud/datastore": "^9.2.1",
     "@google-cloud/firestore": "8.5.0",
     "@google-cloud/pubsub": "^5.3.0",
-    "@google-cloud/spanner": "^8.6.0",
+    "@google-cloud/spanner": "^8.7.1",
     "@google-cloud/storage": "^7.19.0",
-    "firebase-admin": "13.8.0",
-    "msw": "^2.13.4"
+    "firebase-admin": "13.9.0",
+    "msw": "^2.14.5"
   }
 }
diff --git a/packages/modules/k3s/Dockerfile b/packages/modules/k3s/Dockerfile
@@ -1,2 +1,2 @@
-FROM rancher/k3s:v1.35.3-k3s1
-FROM rancher/kubectl:v1.35.2
+FROM rancher/k3s:v1.36.0-k3s1
+FROM rancher/kubectl:v1.36.0
diff --git a/packages/modules/kurrentdb/Dockerfile b/packages/modules/kurrentdb/Dockerfile
@@ -1 +1 @@
-FROM kurrentplatform/kurrentdb:26.0
+FROM kurrentplatform/kurrentdb:26.1
diff --git a/packages/modules/kurrentdb/package.json b/packages/modules/kurrentdb/package.json
@@ -29,7 +29,7 @@
     "build": "tsc --project tsconfig.build.json"
   },
   "devDependencies": {
-    "@kurrent/kurrentdb-client": "^1.1.1"
+    "@kurrent/kurrentdb-client": "^1.2.0"
   },
   "dependencies": {
     "testcontainers": "^11.14.0"
diff --git a/packages/modules/localstack/Dockerfile b/packages/modules/localstack/Dockerfile
@@ -1,2 +1,2 @@
 FROM localstack/localstack:4.14.0
-FROM amazon/aws-cli:2.34.32
+FROM amazon/aws-cli:2.34.45
diff --git a/packages/modules/localstack/package.json b/packages/modules/localstack/package.json
@@ -33,6 +33,6 @@
     "testcontainers": "^11.14.0"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.1032.0"
+    "@aws-sdk/client-s3": "^3.1045.0"
   }
 }
diff --git a/packages/modules/mongodb/package.json b/packages/modules/mongodb/package.json
@@ -29,7 +29,7 @@
     "build": "tsc --project tsconfig.build.json"
   },
   "devDependencies": {
-    "mongoose": "^9.4.1"
+    "mongoose": "^9.6.2"
   },
   "dependencies": {
     "compare-versions": "^6.1.1",
diff --git a/packages/modules/mssqlserver/package.json b/packages/modules/mssqlserver/package.json
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@types/mssql": "^12.3.0",
-    "mssql": "^12.3.1"
+    "mssql": "^12.5.2"
   },
   "dependencies": {
     "testcontainers": "^11.14.0"
diff --git a/packages/modules/mysql/Dockerfile b/packages/modules/mysql/Dockerfile
@@ -1 +1 @@
-FROM mysql:9.6.0
+FROM mysql:9.7.0
diff --git a/packages/modules/mysql/package.json b/packages/modules/mysql/package.json
@@ -29,7 +29,7 @@
     "build": "tsc --project tsconfig.build.json"
   },
   "devDependencies": {
-    "mysql2": "^3.22.1"
+    "mysql2": "^3.22.3"
   },
   "dependencies": {
     "testcontainers": "^11.14.0"
diff --git a/packages/modules/nats/Dockerfile b/packages/modules/nats/Dockerfile
@@ -1 +1 @@
-FROM nats:2.12.7-alpine
+FROM nats:2.14.0-alpine
diff --git a/packages/modules/nats/package.json b/packages/modules/nats/package.json
@@ -32,7 +32,7 @@
     "testcontainers": "^11.14.0"
   },
   "devDependencies": {
-    "@nats-io/jetstream": "^3.3.1",
-    "@nats-io/transport-node": "^3.3.1"
+    "@nats-io/jetstream": "^3.4.0",
+    "@nats-io/transport-node": "^3.4.0"
   }
 }
diff --git a/packages/modules/neo4j/Dockerfile b/packages/modules/neo4j/Dockerfile
@@ -1 +1 @@
-FROM neo4j:5.26.24
+FROM neo4j:5.26.25
diff --git a/packages/modules/ollama/Dockerfile b/packages/modules/ollama/Dockerfile
@@ -1 +1 @@
-FROM ollama/ollama:0.21.0
+FROM ollama/ollama:0.23.2
diff --git a/packages/modules/opensearch/package.json b/packages/modules/opensearch/package.json
@@ -29,7 +29,7 @@
     "build": "tsc --project tsconfig.build.json"
   },
   "devDependencies": {
-    "@opensearch-project/opensearch": "^3.5.1",
+    "@opensearch-project/opensearch": "^3.6.0",
     "@types/zxcvbn": "^4.4.5"
   },
   "dependencies": {
diff --git a/packages/modules/qdrant/Dockerfile b/packages/modules/qdrant/Dockerfile
@@ -1 +1 @@
-FROM qdrant/qdrant:v1.17.1
+FROM qdrant/qdrant:v1.18.0
diff --git a/packages/modules/rabbitmq/Dockerfile b/packages/modules/rabbitmq/Dockerfile
@@ -1 +1 @@
-FROM rabbitmq:4.2.5-management-alpine
+FROM rabbitmq:4.3.0-management-alpine
diff --git a/packages/modules/rabbitmq/package.json b/packages/modules/rabbitmq/package.json
@@ -33,6 +33,6 @@
   },
   "devDependencies": {
     "@types/amqplib": "^0.10.8",
-    "amqplib": "^1.0.3"
+    "amqplib": "^2.0.1"
   }
 }
diff --git a/packages/modules/redpanda/Dockerfile b/packages/modules/redpanda/Dockerfile
@@ -1 +1 @@
-FROM docker.redpanda.com/redpandadata/redpanda:v26.1.5
+FROM docker.redpanda.com/redpandadata/redpanda:v26.1.7
diff --git a/packages/modules/s3mock/package.json b/packages/modules/s3mock/package.json
@@ -33,6 +33,6 @@
     "testcontainers": "^11.14.0"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.1032.0"
+    "@aws-sdk/client-s3": "^3.1045.0"
   }
 }
diff --git a/packages/modules/scylladb/package.json b/packages/modules/scylladb/package.json
@@ -32,6 +32,6 @@
     "testcontainers": "^11.14.0"
   },
   "devDependencies": {
-    "cassandra-driver": "^4.8.0"
+    "cassandra-driver": "^4.9.0"
   }
 }
diff --git a/packages/modules/toxiproxy/package.json b/packages/modules/toxiproxy/package.json
@@ -30,6 +30,6 @@
   },
   "dependencies": {
     "testcontainers": "^11.14.0",
-    "toxiproxy-node-client": "^4.0.0"
+    "toxiproxy-node-client": "^4.1.0"
   }
 }
diff --git a/packages/testcontainers/package.json b/packages/testcontainers/package.json
@@ -37,7 +37,7 @@
     "byline": "^5.0.0",
     "debug": "^4.4.3",
     "docker-compose": "^1.4.2",
-    "dockerode": "^4.0.10",
+    "dockerode": "^5.0.0",
     "get-port": "^7.2.0",
     "proper-lockfile": "^4.1.2",
     "properties-reader": "^3.0.1",
diff --git a/packages/testcontainers/src/generic-container/generic-container.ts b/packages/testcontainers/src/generic-container/generic-container.ts
@@ -8,7 +8,7 @@ import { ContainerRuntimeClient, getContainerRuntimeClient, ImageName } from "..
 import { CONTAINER_STATUSES } from "../container-runtime/clients/container/types";
 import { StartedNetwork } from "../network/network";
 import { PortForwarderInstance, SSHD_IMAGE } from "../port-forwarder/port-forwarder";
-import { getReaper, REAPER_IMAGE } from "../reaper/reaper";
+import { getReaper, getReaperImage } from "../reaper/reaper";
 import { StartedTestContainer, TestContainer } from "../test-container";
 import {
   ArchiveToCopy,
@@ -70,15 +70,15 @@ export class GenericContainer implements TestContainer {
   constructor(image: string) {
     this.imageName = ImageName.fromString(image);
     this.createOpts = { Image: this.imageName.string };
-    this.hostConfig = { AutoRemove: this.imageName.string === REAPER_IMAGE };
+    this.hostConfig = { AutoRemove: this.imageName.string === getReaperImage() };
   }
 
   private isHelperContainer() {
     return this.isReaper() || this.imageName.string === SSHD_IMAGE;
   }
 
   private isReaper() {
-    return this.imageName.string === REAPER_IMAGE;
+    return this.imageName.string === getReaperImage();
   }
 
   protected beforeContainerCreated?(): Promise<void>;
diff --git a/packages/testcontainers/src/reaper/reaper.ts b/packages/testcontainers/src/reaper/reaper.ts
@@ -7,9 +7,18 @@ import { GenericContainer } from "../generic-container/generic-container";
 import { LABEL_TESTCONTAINERS_RYUK, LABEL_TESTCONTAINERS_SESSION_ID } from "../utils/labels";
 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.14.0").string;
+/**
+ * Resolve the Ryuk reaper image name. Read lazily so that callers (and tests)
+ * can set `process.env.RYUK_CONTAINER_IMAGE` _after_ this module is imported —
+ * including via `.env` files loaded by `dotenv` at runtime.
+ *
+ * See https://github.com/testcontainers/testcontainers-node/issues/1310.
+ */
+export function getReaperImage(): string {
+  return process.env["RYUK_CONTAINER_IMAGE"]
+    ? ImageName.fromString(process.env["RYUK_CONTAINER_IMAGE"]).string
+    : ImageName.fromString("testcontainers/ryuk:0.14.0").string;
+}
 
 export interface Reaper {
   sessionId: string;
@@ -87,7 +96,7 @@ async function useExistingReaper(reaperContainer: ContainerInfo, sessionId: stri
 async function createNewReaper(sessionId: string, remoteSocketPath: string): Promise<Reaper> {
   log.debug(`Creating new Reaper for session "${sessionId}" with socket path "${remoteSocketPath}"...`);
 
-  const container = new GenericContainer(REAPER_IMAGE)
+  const container = new GenericContainer(getReaperImage())
     .withName(`testcontainers-ryuk-${sessionId}`)
     .withExposedPorts(
       process.env["TESTCONTAINERS_RYUK_PORT"]

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@`
`32`	`32`	`"testcontainers": "^11.14.0"`
`33`	`33`	`},`
`34`	`34`	`"devDependencies": {`
`35`		`- "cassandra-driver": "^4.8.0"`
	`35`	`+ "cassandra-driver": "^4.9.0"`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-FROM clickhouse/clickhouse-server:26.3-alpine`
	`1`	`+FROM clickhouse/clickhouse-server:26.4-alpine`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-FROM cockroachdb/cockroach:v26.1.2`
	`1`	`+FROM cockroachdb/cockroach:v26.1.4`