Merge branch 'main' into release-11.0.0

Author: cristianrgreco

docs/features/containers.md

@@ -355,7 +355,7 @@ const container = await new GenericContainer("alpine")
   .withAutoRemove(false)
   .start();
 
-await container.stop()
+await container.stop();
 ```
 
 The value specified to `.withAutoRemove()` can be overridden by `.stop()`:
@@ -365,9 +365,12 @@ const container = await new GenericContainer("alpine")
   .withAutoRemove(false)
   .start();
 
-await container.stop({ remove: true }) // The container is stopped *AND* removed
+await container.stop({ remove: true }); // The container is stopped *AND* removed
 ```
 
+Keep in mind that disabling ryuk (set `TESTCONTAINERS_RYUK_DISABLED` to `true`) **and** disabling automatic removal of containers will make containers persist after you're done working with them.
+
+
 Volumes created by the container are removed when stopped. This is configurable:
 
 ```javascript
@@ -425,6 +428,22 @@ const container2 = await new GenericContainer("alpine")
 expect(container1.getId()).toBe(container2.getId());
 ```
 
+You can also re-use stopped but not removed containers.
+
+```javascript
+const container1 = await new GenericContainer("alpine")
+  .withReuse()
+  .withAutoRemove(false)
+  .start();
+await container1.stop();
+
+const container2 = await new GenericContainer("alpine")
+  .withReuse()
+  .start();
+
+expect(container1.getId()).toBe(container2.getId());
+```
+
 Container re-use can be enabled or disabled globally by setting the `TESTCONTAINERS_REUSE_ENABLE` environment variable to `true` or `false`.
 If this environment variable is not declared, the feature is enabled by default.
 

docs/features/images.md

@@ -24,6 +24,17 @@ const container = await GenericContainer
   .build("my-custom-image", { deleteOnExit: false });
 ```
 
+### With buildkit
+
+```javascript
+const { GenericContainer } = require("testcontainers");
+
+const container = await GenericContainer
+  .fromDockerfile("/path/to/build-context")
+  .withBuildkit()
+  .build();
+```
+
 ### With a pull policy
 
 Testcontainers will automatically pull an image if it doesn't exist. This is configurable:
@@ -91,6 +102,15 @@ const container = await GenericContainer
   .build();
 ```
 
+### With platform
+
+```javascript
+const container = await GenericContainer
+  .fromDockerfile("/path/to/build-context")
+  .withPlatform("linux/amd64")
+  .build();
+```
+
 ## Image name substitution
 
 Testcontainers supports automatic substitution of Docker image names.

docs/index.md

@@ -6,10 +6,14 @@
     <a href="https://golang.testcontainers.org/" class="card-grid-item"><img src="/site/language-logos/go.svg"/>Go</a>
     <a href="https://dotnet.testcontainers.org/" class="card-grid-item"><img src="/site/language-logos/dotnet.svg"/>.NET</a>
     <a class="card-grid-item"><img src="/site/language-logos/nodejs.svg"/>Node.js</a>
+    <a href="https://cljdoc.org/d/clj-test-containers/clj-test-containers/0.7.4/doc/readme/" class="card-grid-item" ><img src="/site/language-logos/clojure.svg"/>Clojure</a>
+    <a href="https://github.com/testcontainers/testcontainers-elixir/" class="card-grid-item" ><img src="/site/language-logos/elixir.svg"/>Elixir</a>
+    <a href="https://github.com/testcontainers/testcontainers-hs/" class="card-grid-item"><img src="/site/language-logos/haskell.svg"/>Haskell</a>
     <a href="https://testcontainers-python.readthedocs.io/en/latest/" class="card-grid-item"><img src="/site/language-logos/python.svg"/>Python</a>
-    <a href="https://docs.rs/testcontainers/latest/testcontainers/" class="card-grid-item"><img src="/site/language-logos/rust.svg"/>Rust</a>
-    <a class="card-grid-item" href="https://github.com/testcontainers/testcontainers-hs/"><img src="/site/language-logos/haskell.svg"/>Haskell</a>
     <a href="https://github.com/testcontainers/testcontainers-ruby/" class="card-grid-item" ><img src="/site/language-logos/ruby.svg"/>Ruby</a>
+    <a href="https://docs.rs/testcontainers/latest/testcontainers/" class="card-grid-item"><img src="/site/language-logos/rust.svg"/>Rust</a>
+    <a href="https://github.com/testcontainers/testcontainers-php/" class="card-grid-item" ><img src="/site/language-logos/php.svg"/>PHP</a>
+    <a href="https://github.com/testcontainers/testcontainers-scala/" class="card-grid-item" ><img style="width:30px; height:30px" src="/site/language-logos/scala.svg"/>Scala</a>
 </div>
 
 ## About

docs/site/language-logos/clojure.svg

@@ -1,6 +1,5 @@
 import { CosmosClient, PartitionKeyKind } from "@azure/cosmos";
-import * as https from "node:https";
-import { expect } from "vitest";
+import https from "node:https";
 import { AzureCosmosDbEmulatorContainer } from "./azure-cosmosdb-emulator-container";
 
 const IMAGE = "mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:vnext-EN20250228";

docs/site/language-logos/elixir.svg

@@ -1,5 +1,4 @@
-import * as couchbase from "couchbase";
-import { Bucket, Cluster } from "couchbase";
+import couchbase, { Bucket, Cluster } from "couchbase";
 import { BucketDefinition } from "./bucket-definition";
 import { CouchbaseContainer, StartedCouchbaseContainer } from "./couchbase-container";
 import { CouchbaseService } from "./couchbase-service";

docs/site/language-logos/php.svg

@@ -1,4 +1,4 @@
-import * as admin from "firebase-admin";
+import admin from "firebase-admin";
 import { FirestoreEmulatorContainer, StartedFirestoreEmulatorContainer } from "./firestore-emulator-container";
 
 const IMAGE = "gcr.io/google.com/cloudsdktool/cloud-sdk";