Merge branch 'testcontainers:main' into add_timeplus_container

Author: lizhou1111

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -27,6 +27,7 @@ body:
         - Dynalite
         - Elasticsearch
         - GCloud
+        - Grafana
         - HiveMQ
         - InfluxDB
         - K3S

.github/ISSUE_TEMPLATE/enhancement.yaml

@@ -27,6 +27,7 @@ body:
         - Dynalite
         - Elasticsearch
         - GCloud
+        - Grafana
         - HiveMQ
         - InfluxDB
         - K3S

.github/ISSUE_TEMPLATE/feature.yaml

@@ -27,6 +27,7 @@ body:
         - Dynalite
         - Elasticsearch
         - GCloud
+        - Grafana
         - HiveMQ
         - InfluxDB
         - K3S

.github/dependabot.yml

@@ -106,6 +106,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/grafana"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/hivemq"
     schedule:
@@ -371,6 +376,13 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.diffplug.spotless"
         update-types: [ "version-update:semver-minor" ]
+  
+  # Smoke test
+  - package-ecosystem: "gradle"
+    directory: "/smoke-test"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
 
 # GitHub Actions
   - package-ecosystem: "github-actions"

.github/labeler.yml

@@ -67,6 +67,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/gcloud/**/*
+"modules/grafana":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/grafana/**/*
 "modules/hivemq":
   - changed-files:
     - any-glob-to-any-file:

.github/settings.yml

@@ -145,6 +145,9 @@ labels:
   - name: modules/gcloud
     color: '#006b75'
 
+  - name: modules/grafana
+    color: '#006b75'
+
   - name: modules/hivemq
     color: '#006b75'
 

.github/workflows/moby-latest.yml

@@ -0,0 +1,58 @@
+name: Tests against recent Docker engine releases
+
+on:
+  workflow_dispatch:
+  schedule:
+    # nightly build, at 23:59 CEST
+    - cron:  '59 23 * * *'
+
+jobs:
+  test_docker:
+    strategy:
+      matrix:
+        install-docker-type: ["STABLE", "ROOTLESS", "ROOTFUL"]
+    name: "Core tests using Docker ${{ matrix.install-docker-type }}"
+    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
+
+      - 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
+      - uses: ./.github/actions/setup-junit-report
+
+      - name: Notify to Slack on failures
+        if: failure()
+        id: slack
+        uses: slackapi/[email protected]
+        with:
+          payload: |
+            {
+              "tc_project": "testcontainers-java",
+              "tc_docker_install_type": "${{ matrix.install-docker-type }}",
+              "tc_github_action_url": "https://github.com/testcontainers/testcontainers-java/actions/runs/${{ env.GITHUB_RUN_ID }}/job/${{ env.GITHUB_RUN_NUMBER }}",
+              "tc_github_action_status": "FAILED",
+              "tc_slack_channel_id": "${{ secrets.SLACK_DOCKER_LATEST_CHANNEL_ID }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DOCKER_LATEST_WEBHOOK }}

build.gradle

@@ -88,7 +88,7 @@ subprojects {
         }
         ext.isCI = System.getenv("CI") != null
         if (isCI) {
-            retry {
+            develocity.testRetry {
                 maxRetries = 2
                 maxFailures = 5
                 failOnPassedAfterRetry = false

core/build.gradle

@@ -88,8 +88,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.1'
 
-    api platform('com.github.docker-java:docker-java-bom:3.3.6')
-    shaded platform('com.github.docker-java:docker-java-bom:3.3.6')
+    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 "com.github.docker-java:docker-java-api"
 

core/src/main/java/org/testcontainers/DockerClientFactory.java

@@ -145,7 +145,7 @@ private DockerClientProviderStrategy getOrInitializeStrategy() {
         if (strategy != null) {
             return strategy;
         }
-
+        log.info("Testcontainers version: {}", DEFAULT_LABELS.get(TESTCONTAINERS_VERSION_LABEL));
         List<DockerClientProviderStrategy> configurationStrategies = new ArrayList<>();
         ServiceLoader.load(DockerClientProviderStrategy.class).forEach(configurationStrategies::add);