Output to stdout/stderr while docker-compose process is running (#482)

Ensure the progress of `docker-compose up` is printing to stderr/stdout to prevent circle context deadlines being hit when pulling a large number of containers..
palantir · Sep 29, 2021 · ef580ce · ef580ce
1 parent e43f96f
commit ef580ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/changelog/@unreleased/pr-482.v2.yml b/changelog/@unreleased/pr-482.v2.yml
@@ -0,0 +1,6 @@
+type: fix
+fix:
+  description: Ensure the progress of `docker-compose up` is printing to stderr/stdout
+    to prevent circle context deadlines being hit when pulling a large number of containers..
+  links:
+  - https://github.com/palantir/gradle-docker/pull/482
diff --git a/src/main/groovy/com/palantir/gradle/docker/GradleExecUtils.java b/src/main/groovy/com/palantir/gradle/docker/GradleExecUtils.java
@@ -20,6 +20,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.tools.ant.util.TeeOutputStream;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
@@ -34,8 +35,8 @@ public static void execWithErrorMessage(Project project, Action<ExecSpec> execSp
         ExecResult execResult = project.exec(execSpec -> {
             execSpecAction.execute(execSpec);
             execSpec.setIgnoreExitValue(true);
-            execSpec.setStandardOutput(output);
-            execSpec.setErrorOutput(output);
+            execSpec.setStandardOutput(new TeeOutputStream(System.out, output));
+            execSpec.setErrorOutput(new TeeOutputStream(System.err, output));
             commandLine.addAll(execSpec.getCommandLine());
         });