Merge branch 'develop' into UntilDatabaseIsAvailable

Author: HofmeisterAn

Testcontainers.sln

@@ -53,6 +53,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.FirebirdSql"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Firestore", "src\Testcontainers.Firestore\Testcontainers.Firestore.csproj", "{B3CC460D-0DFD-48A8-9502-54E9828B7B05}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.GCloud", "src\Testcontainers.GCloud\Testcontainers.GCloud.csproj", "{D7CE8744-E58B-4277-BBB7-6840A4FF2049}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.InfluxDb", "src\Testcontainers.InfluxDb\Testcontainers.InfluxDb.csproj", "{8F483B83-7BD4-4BD5-9F03-DFC26E1CE678}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.JanusGraph", "src\Testcontainers.JanusGraph\Testcontainers.JanusGraph.csproj", "{C5AF86A8-2F11-41B6-BB01-325AD9016B94}"
@@ -326,6 +328,10 @@ Global
 		{B3CC460D-0DFD-48A8-9502-54E9828B7B05}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B3CC460D-0DFD-48A8-9502-54E9828B7B05}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3CC460D-0DFD-48A8-9502-54E9828B7B05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7CE8744-E58B-4277-BBB7-6840A4FF2049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7CE8744-E58B-4277-BBB7-6840A4FF2049}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7CE8744-E58B-4277-BBB7-6840A4FF2049}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7CE8744-E58B-4277-BBB7-6840A4FF2049}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8F483B83-7BD4-4BD5-9F03-DFC26E1CE678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F483B83-7BD4-4BD5-9F03-DFC26E1CE678}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8F483B83-7BD4-4BD5-9F03-DFC26E1CE678}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -716,6 +722,7 @@ Global
 		{FF86B509-2F9E-4269-ABC2-912B3339DE29} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{31BAF2C4-0608-4C0F-845A-14FE7C0A1670} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{B3CC460D-0DFD-48A8-9502-54E9828B7B05} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
+		{D7CE8744-E58B-4277-BBB7-6840A4FF2049} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{8F483B83-7BD4-4BD5-9F03-DFC26E1CE678} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{C5AF86A8-2F11-41B6-BB01-325AD9016B94} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{111B840F-9DB0-4166-83E6-0580FD418F07} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}

compose.yml

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

docs/cicd/index.md

@@ -20,3 +20,23 @@ services:
 variables:
   DOCKER_HOST: tcp://docker:2375
 ```
+
+## Bitbucket Pipelines
+
+Enable Bitbucket Pipelines as usual on the **Repository settings → Pipelines → Settings** page. After enabling your pipeline, replace the contents of the `bitbucket-pipelines.yml` file, located at the root of your repository, with the following:
+
+```yml title="bitbucket-pipelines.yml file"
+image: mcr.microsoft.com/dotnet/sdk:8.0
+options:
+  docker: true
+pipelines:
+  default:
+    - step:
+      script:
+        # Bitbucket Pipelines does not support Ryuk:
+        # https://dotnet.testcontainers.org/api/resource_reaper/.
+        - export TESTCONTAINERS_RYUK_DISABLED=true
+        - dotnet test
+      services:
+        - docker
+```

docs/contributing_docs.md

@@ -15,6 +15,10 @@ We publish our documentation using Netlify.
 * Set up a virtualenv and run `pip install -r requirements.txt` in the `testcontainers-dotnet` root directory.
 * Once Python dependencies have been installed, run `mkdocs serve` to start a local auto-updating MkDocs server.
 
+### Using Docker
+
+The root of the project contains a `compose.yml` file. Simply run `docker compose up` and access the docs at: `http://localhost:8000`.
+
 ### PR preview deployments
 
 Note that documentation for pull requests will automatically be published by Netlify as 'deploy preview'.

docs/examples/dind.md docs/dind/index.mddocs/examples/dind.md renamed to docs/dind/index.md

@@ -1,6 +1,6 @@
-# Running inside another container
+# Running inside a container
 
-## 'Docker wormhole' pattern - Sibling Docker containers
+## 'Docker Wormhole' pattern - Sibling Docker containers
 
 ### Docker-only example
 
@@ -33,5 +33,5 @@ services:
     # environment:
     #   - TESTCONTAINERS_HOST_OVERRIDE=host.docker.internal
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      - /var/run/docker.sock.raw:/var/run/docker.sock
 ```

docs/full_framework/index.md

@@ -0,0 +1,11 @@
+# .NET Framework
+
+When working with older versions of the .NET Framework (e.g., .NET Framework 4.x), you may encounter issues related to assembly binding conflicts. These conflicts typically occur when your application requires specific versions of assemblies that are different from the versions being loaded at runtime.
+
+To resolve these conflicts and ensure the correct versions of assemblies are used, binding redirects are often necessary. Binding redirects allow you to specify which version of an assembly should be used by the runtime, preventing errors and version mismatches during execution.
+
+Testcontainers for .NET relies on several external dependencies, which may require different versions of assemblies. Legacy applications or projects targeting the full .NET Framework may not automatically resolve these dependencies correctly, and without binding redirects, runtime errors or unexpected behavior may occur.
+
+In executable .NET Framework projects (such as console apps, web apps, etc.), Visual Studio typically handles binding redirects automatically. However, this is not the case for class libraries or test projects.
+
+For **test projects**, binding redirects are **not automatically added** by Visual Studio, which means you may need to manually configure them in the `App.config` file (or enable [`AutoGenerateBindingRedirects`](https://learn.microsoft.com/dotnet/framework/configure-apps/redirect-assembly-versions#rely-on-automatic-binding-redirection)).

docs/index.md

@@ -7,8 +7,8 @@ dotnet add package Testcontainers
 ```csharp title="Run the Hello World container"
 // Create a new instance of a container.
 var container = new ContainerBuilder()
-  // Set the image for the container to "testcontainers/helloworld:1.1.0".
-  .WithImage("testcontainers/helloworld:1.1.0")
+  // Set the image for the container to "testcontainers/helloworld:1.2.0".
+  .WithImage("testcontainers/helloworld:1.2.0")
   // Bind port 8080 of the container to a random port on the host.
   .WithPortBinding(8080, true)
   // Wait until the HTTP endpoint of the container is available.
@@ -21,7 +21,7 @@ await container.StartAsync()
   .ConfigureAwait(false);
 
 // Create a new instance of HttpClient to send HTTP requests.
-var httpClient = new HttpClient();
+using var httpClient = new HttpClient();
 
 // Construct the request URI by specifying the scheme, hostname, assigned random host port, and the endpoint "uuid".
 var requestUri = new UriBuilder(Uri.UriSchemeHttp, container.Hostname, container.GetMappedPublicPort(8080), "uuid").Uri;

docs/modules/activemq.md

@@ -0,0 +1,47 @@
+# Apache ActiveMQ Artemis
+
+[Apache ActiveMQ Artemis](https://activemq.apache.org/components/artemis/) is an open source project to build a multi-protocol, embeddable, very high performance, clustered, asynchronous messaging system.
+
+Add the following dependency to your project file:
+
+```shell title="NuGet"
+dotnet add package Testcontainers.ActiveMq
+```
+
+You can start an Apache ActiveMQ Artemis container instance from any .NET application. This example uses xUnit.net's `IAsyncLifetime` interface to manage the lifecycle of the container. The container is started in the `InitializeAsync` method before the test method runs, ensuring that the environment is ready for testing. After the test completes, the container is removed in the `DisposeAsync` method.
+
+=== "Base test class"
+    ```csharp
+    --8<-- "tests/Testcontainers.ActiveMq.Tests/ArtemisContainerTest.cs:UseArtemisContainer"
+    }
+    ```
+=== "Without auth"
+    ```csharp
+    --8<-- "tests/Testcontainers.ActiveMq.Tests/ArtemisContainerTest.cs:UseArtemisContainerNoAuth"
+    ```
+=== "Default credentials"
+    ```csharp
+    --8<-- "tests/Testcontainers.ActiveMq.Tests/ArtemisContainerTest.cs:UseArtemisContainerDefaultAuth"
+    ```
+=== "Custom credentials"
+    ```csharp
+    --8<-- "tests/Testcontainers.ActiveMq.Tests/ArtemisContainerTest.cs:UseArtemisContainerCustomAuth"
+    ```
+
+Connect to the container and produce a message:
+
+=== "EstablishesConnection"
+    ```csharp
+    --8<-- "tests/Testcontainers.ActiveMq.Tests/ArtemisContainerTest.cs:ArtemisContainerEstablishesConnection"
+    ```
+
+The test example uses the following NuGet dependencies:
+
+=== "Package References"
+    ```xml
+    --8<-- "tests/Testcontainers.ActiveMq.Tests/Testcontainers.ActiveMq.Tests.csproj:PackageReferences"
+    ```
+
+To execute the tests, use the command `dotnet test` from a terminal.
+
+--8<-- "docs/modules/_call_out_test_projects.txt"

mkdocs.yml

@@ -41,16 +41,18 @@ nav:
   - api/resource_reuse.md
   - api/wait_strategies.md
   - api/best_practices.md
+  - dind/index.md
+  - full_framework/index.md
   - test_frameworks/xunit_net.md
   - Examples:
-    - examples/dind.md
     - examples/aspnet.md
   - Modules:
     - modules/index.md
-    - modules/cassandra.md
-    - modules/pulsar.md
-    - modules/eventhubs.md
-    - modules/servicebus.md
+    - modules/activemq.md # Apache
+    - modules/cassandra.md # Apache
+    - modules/pulsar.md # Apache
+    - modules/eventhubs.md # Azure
+    - modules/servicebus.md # Azure
     - modules/db2.md
     - modules/elasticsearch.md
     - modules/mongodb.md

src/Testcontainers.GCloud/.editorconfig

@@ -0,0 +1 @@
+root = true