Merge branch 'main' into ubuntu-24.04

Author: cristianrgreco

docker-compose.yml

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

docs/configuration.md

@@ -32,16 +32,17 @@ 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.14.0 | Custom image for ryuk                        |
-| SSHD_CONTAINER_IMAGE                  | testcontainers/sshd:1.3.0  | Custom image for SSHd                        |
-| TESTCONTAINERS_REUSE_ENABLE           | true                       | Enable reusable containers                   |
-| TESTCONTAINERS_RYUK_VERBOSE           | true                       | Sets RYUK_VERBOSE env var in ryuk container  |
+| 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.14.0 | Custom image for ryuk                                    |
+| SSHD_CONTAINER_IMAGE                     | testcontainers/sshd:1.3.0  | Custom image for SSHd                                    |
+| TESTCONTAINERS_REUSE_ENABLE              | true                       | Enable reusable containers                               |
+| TESTCONTAINERS_RYUK_VERBOSE              | true                       | Sets RYUK_VERBOSE env var in ryuk container              |
+| TESTCONTAINERS_RYUK_RECONNECTION_TIMEOUT | 30s                        | Sets RYUK_RECONNECTION_TIMEOUT env var in ryuk container |

docs/modules/s3mock.md

@@ -0,0 +1,23 @@
+# S3Mock
+
+## Install
+
+```bash
+npm install @testcontainers/s3mock --save-dev
+```
+
+## Examples
+
+These examples use the following libraries:
+
+- [@aws-sdk/client-s3](https://www.npmjs.com/package/@aws-sdk/client-s3)
+
+        npm install @aws-sdk/client-s3
+
+Choose an image from the [container registry](https://hub.docker.com/r/adobe/s3mock) and substitute `IMAGE`.
+
+### Create a S3 bucket
+
+<!--codeinclude-->
+[](../../packages/modules/s3mock/src/s3mock-container.test.ts) inside_block:s3mockCreateS3Bucket
+<!--/codeinclude-->

mkdocs.yml

@@ -85,6 +85,7 @@ nav:
       - RabbitMQ: modules/rabbitmq.md
       - Redis: modules/redis.md
       - Redpanda: modules/redpanda.md
+      - S3Mock: modules/s3mock.md
       - ScyllaDB: modules/scylladb.md
       - Selenium: modules/selenium.md
       - ToxiProxy: modules/toxiproxy.md