Skip to content
This repository was archived by the owner on Jan 17, 2024. It is now read-only.

Commit 521f27a

Browse files
authored
Merge pull request #45 from raydouglass/fix-side-container-network
Remove double network for side containers
2 parents fe174f2 + b7db483 commit 521f27a

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/main/java/com/gpuopenanalytics/jenkins/remotedocker/DockerNetwork.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ private DockerNetwork(String id) {
5252
*/
5353
public static DockerNetwork create(AbstractDockerLauncher launcher) throws IOException, InterruptedException {
5454
ArgumentListBuilder args = new ArgumentListBuilder();
55-
args.add("docker", "network", "create", UUID.randomUUID().toString());
55+
args.add("docker", "network", "create", "-d", "bridge",
56+
UUID.randomUUID().toString());
57+
5658
ByteArrayOutputStream baos = new ByteArrayOutputStream();
5759
int status = launcher.executeCommand(args)
5860
.stdout(baos)

src/main/java/com/gpuopenanalytics/jenkins/remotedocker/DockerState.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,14 @@ private static ArgumentListBuilder getlaunchArgs(RemoteDockerBuildWrapper buildW
249249

250250
//TODO Set name? Maybe with build.toString().replaceAll("^\\w", "_")
251251
ArgumentListBuilder args = new ArgumentListBuilder()
252-
.add("run", "-t", "-d")
253-
//Add bridge network for internet access
254-
.add("--network", "bridge");
255-
//Add inter-container network if needed
256-
network.ifPresent(net -> net.addArgs(args));
252+
.add("run", "-t", "-d");
253+
if (network.isPresent()) {
254+
//Add inter-container network
255+
network.get().addArgs(args);
256+
} else {
257+
//Add bridge network for internet access
258+
args.add("--network", "bridge");
259+
}
257260

258261
if (isMain) {
259262
String secondaryTempPath = WorkspaceList.tempDir(workspace)

0 commit comments

Comments
 (0)