Merge branch 'main' into couchbase-retry-createPrimaryIndex

Author: vincz777

.github/workflows/ci-rootless.yml

@@ -48,9 +48,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup rootless Docker
-        uses: ScribeMD/rootless-docker@0.2.2
-      - name: Remove Docket root socket
-        run: sudo rm -rf /var/run/docker.sock
+        uses: docker/setup-docker-action@v4
+        with:
+          rootless: true
       - name: Setup Gradle Build Action
         uses: gradle/actions/setup-gradle@v4
       - name: Build with Gradle

.github/workflows/moby-latest.yml

@@ -13,35 +13,31 @@ jobs:
   test_docker:
     strategy:
       matrix:
-        install-docker-type: ["STABLE", "ROOTLESS", "ROOTFUL"]
-    name: "Core tests using Docker ${{ matrix.install-docker-type }}"
+        include:
+          - { install-docker-type: "STABLE", channel: stable, rootless: false }
+          - { install-docker-type: "ROOTLESS", channel: stable, rootless: true }
+          - { install-docker-type: "ROOTFUL", channel: test, rootless: false }
+    name: "Core tests using Docker ${{ matrix.install-docker-type }} (channel ${{ matrix.channel }})"
     runs-on: ubuntu-22.04
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
 
       - name: Install Stable Docker
-        if: ${{ matrix.install-docker-type == 'STABLE' }}
-        run: curl https://get.docker.com
-
-      - name: Install Docker from the TEST channel
-        if: ${{ matrix.install-docker-type == 'ROOTFUL' }}
-        run: curl https://get.docker.com | CHANNEL=test sh
-
-      - name: Setup rootless Docker
-        if: ${{ matrix.install-docker-type == 'ROOTLESS' }}
-        uses: ScribeMD/rootless-docker@6bd157a512c2fafa4e0243a8aa87d964eb890886  # v0.2.2
-
-      - name: Remove Docker root socket
-        if: ${{ matrix.install-docker-type == 'ROOTLESS' }}
-        run: sudo rm -rf /var/run/docker.sock
+        id: setup_docker
+        uses: docker/setup-docker-action@v4
+        with:
+          channel: ${{ matrix.channel }}
+          rootless: ${{ matrix.rootless }}
 
       - name: Check Docker version
         run: docker version
 
       - name: Build with Gradle
         run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_${{ matrix.install-docker-type }} testcontainers:test -Dorg.gradle.caching=false
+        env:
+          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
       - uses: ./.github/actions/setup-junit-report
 
       - name: Notify to Slack on failures

core/build.gradle

@@ -88,8 +88,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.4.0')
-    shaded platform('com.github.docker-java:docker-java-bom:3.4.0')
+    api platform('com.github.docker-java:docker-java-bom:3.4.1')
+    shaded platform('com.github.docker-java:docker-java-bom:3.4.1')
 
     api "com.github.docker-java:docker-java-api"
 

core/src/test/java/org/testcontainers/containers/GenericContainerTest.java

@@ -52,7 +52,7 @@ public class GenericContainerTest {
     public void shouldReportOOMAfterWait() {
         Info info = DockerClientFactory.instance().client().infoCmd().exec();
         // Poor man's rootless Docker detection :D
-        Assumptions.assumeThat(info.getSecurityOptions()).doesNotContain("rootless");
+        Assumptions.assumeThat(info.getSecurityOptions()).doesNotContain("name=rootless");
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())

core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java

@@ -18,6 +18,7 @@
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
@@ -147,6 +148,8 @@ public void applicableWhenIgnoringUserPropertiesAndConfigured() {
 
     @Test
     public void notApplicableWhenIgnoringUserPropertiesAndNotConfigured() {
+        assumeThat(System.getenv("DOCKER_HOST")).isNull();
+
         Mockito
             .doReturn("autoIgnoringUserProperties")
             .when(TestcontainersConfiguration.getInstance())

docs/examples/junit4/generic/build.gradle

@@ -10,16 +10,3 @@ dependencies {
     testImplementation "org.seleniumhq.selenium:selenium-api:4.25.0"
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-    options.release.set(11)
-}

docs/index.md

@@ -221,6 +221,8 @@ A huge thank you to our sponsors:
 * [Spark ClickHouse Connector](https://github.com/housepower/spark-clickhouse-connector) - Integration tests for Apache Spark with both single node ClickHouse instance and multi-node ClickHouse cluster.
 * [Quarkus](https://github.com/quarkusio/quarkus) - Testcontainers is used extensively for Quarkus' [DevServices](https://quarkus.io/guides/dev-services) feature.
 * [Apache Kyuubi](https://kyuubi.apache.org) - Integration testing with Trino as data source engine, Kafka, etc.
+* [Dash0](https://www.dash0.com) - Integration testing for OpenTelemetry Observability product.
+
 
 ## License
 

docs/modules/azure.md

@@ -5,14 +5,73 @@ This module is INCUBATING. While it is ready for use and operational in the curr
 
 Testcontainers module for the Microsoft Azure's [SDK](https://github.com/Azure/azure-sdk-for-java).
 
-Currently, the module supports `CosmosDB` emulator. In order to use it, you should use the following class:
+Currently, the module supports `Azurite` and `CosmosDB` emulators. In order to use them, you should use the following classes:
 
 Class | Container Image
 -|-
+AzuriteContainer | [mcr.microsoft.com/azure-storage/azurite](https://github.com/microsoft/containerregistry)
 CosmosDBEmulatorContainer | [mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator](https://github.com/microsoft/containerregistry)
 
 ## Usage example
 
+### Azurite Storage Emulator
+
+Start Azurite Emulator during a test:
+
+<!--codeinclude-->
+[Starting a Azurite container](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:emulatorContainer
+<!--/codeinclude-->
+
+!!! note
+    SSL configuration is possible using the `withSsl(MountableFile, String)` and  `withSsl(MountableFile, MountableFile)` methods.
+
+If the tested application needs to use more than one set of credentials, the container can be configured to use custom credentials.
+Please see some examples below.
+
+<!--codeinclude-->
+[Starting a Azurite Blob container with one account and two keys](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:withTwoAccountKeys
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Starting a Azurite Blob container with more accounts and keys](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:withMoreAccounts
+<!--/codeinclude-->
+
+#### Using with Blob
+
+Build Azure Blob client:
+
+<!--codeinclude-->
+[Build Azure Blob Service client](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:createBlobClient
+<!--/codeinclude-->
+
+In case the application needs to use custom credentials, we can obtain them with a different method:
+
+<!--codeinclude-->
+[Obtain connection string with non-default credentials](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:useNonDefaultCredentials
+<!--/codeinclude-->
+
+#### Using with Queue
+
+Build Azure Queue client:
+
+<!--codeinclude-->
+[Build Azure Queue Service client](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:createQueueClient
+<!--/codeinclude-->
+
+!!! note
+    We can use custom credentials the same way as defined in the Blob section.
+
+#### Using with Table
+
+Build Azure Table client:
+
+<!--codeinclude-->
+[Build Azure Table Service client](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:createTableClient
+<!--/codeinclude-->
+
+!!! note
+    We can use custom credentials the same way as defined in the Blob section.
+
 ### CosmosDB
 
 Start Azure CosmosDB Emulator during a test:

examples/cucumber/build.gradle

@@ -18,16 +18,3 @@ dependencies {
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-    options.release.set(11)
-}

modules/activemq/build.gradle

@@ -7,16 +7,3 @@ dependencies {
     testImplementation "org.apache.activemq:activemq-client:6.1.2"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.37.0"
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-    options.release.set(11)
-}