fix: address windows deadlock issue when determining docker environment info (#4288)

mpeddada1 · web-flow · commit 18d5c7739296 · 2024-07-19T14:53:26.000-04:00
diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/docker/CliDockerClient.java b/jib-core/src/main/java/com/google/cloud/tools/jib/docker/CliDockerClient.java
@@ -189,11 +189,12 @@ public boolean supported(Map<String, String> parameters) {
   public DockerInfoDetails info() throws IOException, InterruptedException {
     // Runs 'docker info'.
     Process infoProcess = docker("info", "-f", "{{json .}}");
+    InputStream inputStream = infoProcess.getInputStream();
     if (infoProcess.waitFor() != 0) {
       throw new IOException(
           "'docker info' command failed with error: " + getStderrOutput(infoProcess));
     }
-    return JsonTemplateMapper.readJson(infoProcess.getInputStream(), DockerInfoDetails.class);
+    return JsonTemplateMapper.readJson(inputStream, DockerInfoDetails.class);
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -189,11 +189,12 @@ public boolean supported(Map<String, String> parameters) {`
`189`	`189`	`public DockerInfoDetails info() throws IOException, InterruptedException {`
`190`	`190`	`// Runs 'docker info'.`
`191`	`191`	`Process infoProcess = docker("info", "-f", "{{json .}}");`
	`192`	`+ InputStream inputStream = infoProcess.getInputStream();`
`192`	`193`	`if (infoProcess.waitFor() != 0) {`
`193`	`194`	`throw new IOException(`
`194`	`195`	`"'docker info' command failed with error: " + getStderrOutput(infoProcess));`
`195`	`196`	`}`
`196`		`- return JsonTemplateMapper.readJson(infoProcess.getInputStream(), DockerInfoDetails.class);`
	`197`	`+ return JsonTemplateMapper.readJson(inputStream, DockerInfoDetails.class);`
`197`	`198`	`}`
`198`	`199`
`199`	`200`	`@Override`