Merge branch 'main' into ubuntu-24.04

Author: cristianrgreco

.github/dependabot.yml

@@ -2,43 +2,7 @@ version: 2
 
 updates:
   - package-ecosystem: "npm"
-    directories:
-      - "/"
-      - "/packages/testcontainers"
-      - "/packages/modules/arangodb"
-      - "/packages/modules/azurecosmosdb"
-      - "/packages/modules/azurite"
-      - "/packages/modules/cassandra"
-      - "/packages/modules/chromadb"
-      - "/packages/modules/clickhouse"
-      - "/packages/modules/cockroachdb"
-      - "/packages/modules/couchbase"
-      - "/packages/modules/elasticsearch"
-      - "/packages/modules/etcd"
-      - "/packages/modules/gcloud"
-      - "/packages/modules/hivemq"
-      - "/packages/modules/k3s"
-      - "/packages/modules/kafka"
-      - "/packages/modules/localstack"
-      - "/packages/modules/mariadb"
-      - "/packages/modules/minio"
-      - "/packages/modules/mockserver"
-      - "/packages/modules/mongodb"
-      - "/packages/modules/mssqlserver"
-      - "/packages/modules/mysql"
-      - "/packages/modules/nats"
-      - "/packages/modules/neo4j"
-      - "/packages/modules/ollama"
-      - "/packages/modules/postgresql"
-      - "/packages/modules/qdrant"
-      - "/packages/modules/rabbitmq"
-      - "/packages/modules/redis"
-      - "/packages/modules/redpanda"
-      - "/packages/modules/scylladb"
-      - "/packages/modules/selenium"
-      - "/packages/modules/toxiproxy"
-      - "/packages/modules/valkey"
-      - "/packages/modules/weaviate"
+    directory: "/"
     schedule:
       interval: "weekly"
     labels:
@@ -106,3 +70,39 @@ updates:
       actions:
         patterns:
           - "*"
+
+  - package-ecosystem: "devcontainers"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "dependencies"
+      - "devcontainers"
+    groups:
+      dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "docker-compose"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "dependencies"
+      - "docker_compose"
+    groups:
+      dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "dependencies"
+      - "pip"
+    groups:
+      dependencies:
+        patterns:
+          - "*"

.nvmrc

@@ -1 +1 @@
-v24
+24

docker-compose.yml

@@ -1,9 +1,9 @@
 services:
   docs:
-    image: python:3.8
+    image: python:3.13
     command: sh -c "pip install -r requirements.txt && mkdocs serve -a 0.0.0.0:8000"
     working_dir: /docs
     volumes:
       - ./:/docs
     ports:
-      - 8000:8000
+      - 8000:8000

docs/features/compose.md

@@ -142,6 +142,17 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
   .up();
 ```
 
+### With custom client options
+
+See [docker-compose](https://github.com/PDMLab/docker-compose/) library.
+
+```javascript
+const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
+  .withClientOptions({ executable: { standalone: true, executablePath: "/path/to/docker-compose" } })
+  .up();
+```
+
+
 ## Downing a Docker compose environment
 
 Testcontainers by default will not wait until the environment has downed. It will simply issue the down command and return immediately. This is to save time when running tests.

docs/modules/kafka.md

@@ -8,20 +8,34 @@
 npm install @testcontainers/kafka --save-dev
 ```
 
-## Examples
+## Kafka 8.x
+
+### Examples
+
+<!--codeinclude-->
+[Connect to Kafka:](../../packages/modules/kafka/src/kafka-container-latest.test.ts) inside_block:connectKafkaLatest
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Connect to Kafka using SSL:](../../packages/modules/kafka/src/kafka-container-latest.test.ts) inside_block:ssl
+<!--/codeinclude-->
+
+## Kafka 7.x
+
+### Examples
 
 <!--codeinclude-->
-[Connect to Kafka using in-built ZooKeeper:](../../packages/modules/kafka/src/kafka-container.test.ts) inside_block:connectBuiltInZK
+[Connect to Kafka using in-built ZooKeeper:](../../packages/modules/kafka/src/kafka-container-7.test.ts) inside_block:connectBuiltInZK
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Connect to Kafka using your own ZooKeeper:](../../packages/modules/kafka/src/kafka-container.test.ts) inside_block:connectProvidedZK
+[Connect to Kafka using your own ZooKeeper:](../../packages/modules/kafka/src/kafka-container-7.test.ts) inside_block:connectProvidedZK
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Connect to Kafka using SSL:](../../packages/modules/kafka/src/kafka-container.test.ts) inside_block:ssl
+[Connect to Kafka using SSL:](../../packages/modules/kafka/src/kafka-container-7.test.ts) inside_block:ssl
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Connect to Kafka using Kraft:](../../packages/modules/kafka/src/kafka-container.test.ts) inside_block:connectKraft
+[Connect to Kafka using Kraft:](../../packages/modules/kafka/src/kafka-container-7.test.ts) inside_block:connectKraft
 <!--/codeinclude-->

docs/site/theme/partials/nav.html

@@ -18,6 +18,7 @@
 -->
 
 <!-- Determine class according to configuration -->
+{% import "partials/nav-item.html" as item with context %}
 {% set class = "md-nav md-nav--primary" %}
 {% if "navigation.tabs" in features %}
 {% set class = class ~ " md-nav--lifted" %}
@@ -45,8 +46,7 @@
   <ul class="md-nav__list" data-md-scrollfix>
     {% for nav_item in nav %}
     {% set path = "__nav_" ~ loop.index %}
-    {% set level = 1 %}
-    {% include "partials/nav-item.html" %}
+    {{ item.render(nav_item, path, 1) }}
     {% endfor %}
     <li class="community-callout-wrapper">
       <div class="community-callout">

mkdocs.yml

@@ -30,6 +30,8 @@ markdown_extensions:
   - pymdownx.superfences
   - pymdownx.tabbed:
       alternate_style: true
+  - toc:
+      permalink: true
 
 nav:
   - Home: index.md