Merge branch 'main' into ubuntu-24.04

Author: cristianrgreco

.github/workflows/checks.yml

@@ -27,7 +27,7 @@ jobs:
       modules_count: ${{ steps.set-modified-modules-count.outputs.modules_count }}
     steps:
       - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v5
       - id: changed-files
         name: Get changed files
         uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install Node and Dependencies
         id: npm-install-modules
         uses: ./.github/actions/npm-setup
@@ -82,7 +82,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install Node and Dependencies
         id: npm-install
         uses: ./.github/actions/npm-setup
@@ -111,7 +111,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install Node ${{ matrix.node-version }} and Dependencies
         uses: ./.github/actions/npm-setup
         with:
@@ -124,8 +124,12 @@ jobs:
         run: npm prune --omit=dev --workspace packages/testcontainers
       - name: Run CommonJS module smoke test
         run: node packages/testcontainers/smoke-test.js
+        env:
+          DEBUG: "testcontainers*"
       - name: Run ES module smoke test
         run: node packages/testcontainers/smoke-test.mjs
+        env:
+          DEBUG: "testcontainers*"
 
   test:
     if: ${{ needs.detect-modules.outputs.modules_count > 0 }}

.github/workflows/codeql-analysis.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:

.github/workflows/dependency-review.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: "Dependency Review"
         uses: actions/dependency-review-action@v4
         with:

.github/workflows/npm-publish.yml

@@ -8,7 +8,7 @@ jobs:
   publish:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: main
 

.github/workflows/test-template.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ${{ inputs.runner }}
     steps:
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Docker rootless setup
         if: ${{ inputs.container-runtime == 'docker-rootless' }}
@@ -43,7 +43,7 @@ jobs:
           runner: ${{ inputs.runner }}
 
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install Node ${{ inputs.node-version }} and Dependencies
         id: npm-install

.github/workflows/windows-test.yml

@@ -27,7 +27,7 @@ jobs:
             }
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}

.prettierrc

@@ -1,5 +1,8 @@
 {
   "printWidth": 120,
   "trailingComma": "es5",
-  "plugins": ["prettier-plugin-organize-imports"]
-}
+  "plugins": [
+    "prettier-plugin-organize-imports"
+  ],
+  "endOfLine": "auto"
+}

docs/configuration.md

@@ -33,15 +33,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.11.0 | Custom image for ryuk                        |
-| SSHD_CONTAINER_IMAGE                  | testcontainers/sshd:1.1.0  | Custom image for SSHd                        |
+| 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  |

docs/features/advanced.md

@@ -2,7 +2,7 @@
 
 ## Container Runtime Client
 
-Testcontainers configures an underlying container runtime to perform its tasks. This runtime works automatically with several providers like Docker, Podman, Colima, Rancher Desktop and Testcontainers Desktop. There are too many usage examples to list here, but here are some common examples:
+Testcontainers configures an underlying container runtime to perform its tasks. This runtime works automatically with several providers like Docker, Podman, Colima, Rancher Desktop and Testcontainers Desktop. There are too many usage examples to list here, but here are some common examples.
 
 ### Fetch container runtime information
 

docs/features/compose.md

@@ -4,7 +4,7 @@
 
 Create and start a Docker Compose environment:
 
-```javascript
+```js
 const { DockerComposeEnvironment } = require("testcontainers");
 
 const composeFilePath = "/path/to/build-context";
@@ -15,7 +15,7 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
 
 You can override by providing [multiple compose files](https://docs.docker.com/compose/extends/#multiple-compose-files):
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(
   composeFilePath, 
   [
@@ -27,14 +27,14 @@ const environment = await new DockerComposeEnvironment(
 
 Provide a list of service names to only start those services:
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
   .up(["redis-1", "postgres-1"]);
 ```
 
 ### With wait strategy
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
   .withWaitStrategy("redis-1", Wait.forLogMessage("Ready to accept connections"))
   .withWaitStrategy("postgres-1", Wait.forHealthCheck())
@@ -46,7 +46,7 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
 By default Testcontainers uses the "listening ports" wait strategy for all containers. If you'd like to override
 the default wait strategy for all services, you can do so:
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
   .withDefaultWaitStrategy(Wait.forHealthCheck())
   .up();
@@ -56,7 +56,7 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
 
 Testcontainers will automatically pull an image if it doesn't exist. This is configurable:
 
-```javascript
+```js
 const { DockerComposeEnvironment, PullPolicy } = require("testcontainers");
 
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
@@ -66,7 +66,7 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
 
 Create a custom pull policy:
 
-```typescript
+```ts
 const { GenericContainer, ImagePullPolicy } = require("testcontainers");
 
 class CustomPullPolicy implements ImagePullPolicy {
@@ -82,7 +82,7 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
 
 ### With rebuild
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
   .withBuild()
   .up();
@@ -92,7 +92,7 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
 
 See [environment file](https://docs.docker.com/compose/environment-variables/#using-the---env-file--option).
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
   .withEnvironmentFile(".env.custom")
   .up();
@@ -102,15 +102,15 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
 
 See [profiles](https://docs.docker.com/compose/profiles/).
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
   .withProfiles("profile1", "profile2")
   .up();
 ```
 
 ### With no recreate
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
   .withNoRecreate()
   .up();
@@ -126,7 +126,7 @@ services:
     image: redis:${TAG}
 ```
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
   .withEnvironment({ "TAG": "VALUE" })
   .up();
@@ -136,7 +136,7 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
 
 See [project name](https://docs.docker.com/compose/project-name/).
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
   .withProjectName("test")
   .up();
@@ -146,7 +146,7 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
 
 See [docker-compose](https://github.com/PDMLab/docker-compose/) library.
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
   .withClientOptions({ executable: { standalone: true, executablePath: "/path/to/docker-compose" } })
   .up();
@@ -157,21 +157,21 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
 
 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.
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile).up();
 await environment.down();
 ```
 
 If you need to wait for the environment to be downed, you can provide a timeout:
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile).up();
 await environment.down({ timeout: 10_000 }); // 10 seconds
 ```
 
 Volumes created by the environment are removed when stopped. This is configurable:
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile).up();
 await environment.down({ removeVolumes: false });
 ```
@@ -180,7 +180,7 @@ await environment.down({ removeVolumes: false });
 
 If you have multiple docker-compose environments which share dependencies such as networks, you can stop the environment instead of downing it:
 
-```javascript
+```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile).up();
 await environment.stop();
 ```
@@ -189,6 +189,6 @@ await environment.stop();
 
 Interact with the containers in your compose environment as you would any other Generic Container. Note that the container name suffix has changed from `_` to `-` between docker-compose v1 and v2 respectively.
 
-```javascript
+```js
 const container = environment.getContainer("alpine-1");
 ```