From 211caf5df6a363980d75204827511dfa99b8c447 Mon Sep 17 00:00:00 2001
From: "m.syomin" <m.syomin@vkteam.ru>
Date: Wed, 27 May 2026 06:19:24 +0300
Subject: [PATCH] fix: container name conflict

---
 .../containers/tarantool/Tarantool3Container.java    |  5 ++++-
 .../integration/tdb/TDB2ClusterImplTest.java         | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/testcontainers/src/main/java/org/testcontainers/containers/tarantool/Tarantool3Container.java b/testcontainers/src/main/java/org/testcontainers/containers/tarantool/Tarantool3Container.java
index 6620d9ab..54615b92 100644
--- a/testcontainers/src/main/java/org/testcontainers/containers/tarantool/Tarantool3Container.java
+++ b/testcontainers/src/main/java/org/testcontainers/containers/tarantool/Tarantool3Container.java
@@ -230,7 +230,10 @@ protected void configure() {
       withPrivilegedMode(true);
       withCreateContainerCmdModifier(
           cmd -> {
-            cmd.withName(this.node).withUser("root");
+            cmd.withUser("root");
+            if (cmd.getName() == null) {
+              cmd.withName(this.node);
+            }
             String[] originalEntrypoint =
                 cmd.getEntrypoint() != null && cmd.getEntrypoint().length > 0
                     ? cmd.getEntrypoint()
diff --git a/testcontainers/src/test/java/org/testcontainers/containers/integration/tdb/TDB2ClusterImplTest.java b/testcontainers/src/test/java/org/testcontainers/containers/integration/tdb/TDB2ClusterImplTest.java
index df52377c..044e778e 100644
--- a/testcontainers/src/test/java/org/testcontainers/containers/integration/tdb/TDB2ClusterImplTest.java
+++ b/testcontainers/src/test/java/org/testcontainers/containers/integration/tdb/TDB2ClusterImplTest.java
@@ -394,4 +394,16 @@ void testSimpleMultipleRestart() throws InterruptedException {
       c.restart(1, TimeUnit.SECONDS);
     }
   }
+
+  @RepeatedTest(3)
+  void testSequentialClustersWithSameInstanceNamesDoNotConflict() {
+    for (int i = 0; i < 2; i++) {
+      try (TDBCluster c =
+          TDB2ClusterImpl.builder(TARANTOOL_DB_IMAGE_NAME)
+              .withStartupTimeout(STARTUP_TIMEOUT)
+              .build()) {
+        c.start();
+      }
+    }
+  }
 }