Commit 2700c429dda9574e12ea02a12bb50f754556e582
1 parent
bd3e2618
Unique name for logs container in order to avoid container name conflicts
Showing
1 changed file
with
6 additions
and
3 deletions
@@ -15,6 +15,7 @@ | @@ -15,6 +15,7 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.server.msa; | 16 | package org.thingsboard.server.msa; |
17 | 17 | ||
18 | +import org.apache.commons.lang3.RandomStringUtils; | ||
18 | import org.junit.rules.ExternalResource; | 19 | import org.junit.rules.ExternalResource; |
19 | import org.testcontainers.utility.Base58; | 20 | import org.testcontainers.utility.Base58; |
20 | 21 | ||
@@ -136,13 +137,15 @@ public class ThingsBoardDbInstaller extends ExternalResource { | @@ -136,13 +137,15 @@ public class ThingsBoardDbInstaller extends ExternalResource { | ||
136 | File tbLogsDir = new File(targetDir); | 137 | File tbLogsDir = new File(targetDir); |
137 | tbLogsDir.mkdirs(); | 138 | tbLogsDir.mkdirs(); |
138 | 139 | ||
139 | - dockerCompose.withCommand("run -d --rm --name tb-logs-container -v " + volumeName + ":/root alpine tail -f /dev/null"); | 140 | + String logsContainerName = "tb-logs-container-" + RandomStringUtils.randomAlphanumeric(10); |
141 | + | ||
142 | + dockerCompose.withCommand("run -d --rm --name " + logsContainerName + " -v " + volumeName + ":/root alpine tail -f /dev/null"); | ||
140 | dockerCompose.invokeDocker(); | 143 | dockerCompose.invokeDocker(); |
141 | 144 | ||
142 | - dockerCompose.withCommand("cp tb-logs-container:/root/. "+tbLogsDir.getAbsolutePath()); | 145 | + dockerCompose.withCommand("cp " + logsContainerName + ":/root/. "+tbLogsDir.getAbsolutePath()); |
143 | dockerCompose.invokeDocker(); | 146 | dockerCompose.invokeDocker(); |
144 | 147 | ||
145 | - dockerCompose.withCommand("rm -f tb-logs-container"); | 148 | + dockerCompose.withCommand("rm -f " + logsContainerName); |
146 | dockerCompose.invokeDocker(); | 149 | dockerCompose.invokeDocker(); |
147 | } | 150 | } |
148 | 151 |