From e0918aaf87c99e358921c4513b258f95d252b410 Mon Sep 17 00:00:00 2001
From: Jan Sykora <jansyk13@gmail.com>
Date: Wed, 9 Nov 2022 17:56:28 +0100
Subject: [PATCH] Propagate all setting about log capture to nested settings

---
 .../gradle/dockercompose/ComposeSettings.groovy  |  6 +++++-
 .../dockercompose/DockerComposePluginTest.groovy | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy b/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy
index dfd5d8ed..19135d6f 100644
--- a/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy
+++ b/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy
@@ -194,7 +194,11 @@ abstract class ComposeSettings {
         r.waitForHealthyStateTimeout.set(waitForHealthyStateTimeout.get())
         r.checkContainersRunning.set(checkContainersRunning.get())
 
-        r.captureContainersOutput.set(captureContainersOutput.get())
+        r.captureContainersOutput.set(this.captureContainersOutput.get())
+        r.captureContainersOutputToFile.set(this.captureContainersOutputToFile.getOrNull())
+        r.captureContainersOutputToFiles.set(this.captureContainersOutputToFiles.getOrNull())
+        r.composeLogToFile.set(this.composeLogToFile.getOrNull())
+        r.containerLogToDir.set(this.containerLogToDir.getOrNull())
 
         r.projectNamePrefix = this.projectNamePrefix
 
diff --git a/src/test/groovy/com/avast/gradle/dockercompose/DockerComposePluginTest.groovy b/src/test/groovy/com/avast/gradle/dockercompose/DockerComposePluginTest.groovy
index b0174c88..7815302a 100644
--- a/src/test/groovy/com/avast/gradle/dockercompose/DockerComposePluginTest.groovy
+++ b/src/test/groovy/com/avast/gradle/dockercompose/DockerComposePluginTest.groovy
@@ -116,6 +116,22 @@ class DockerComposePluginTest extends Specification {
         project.dockerCompose.nested.ignorePushFailure.get() == true
     }
 
+    def "configuration of log capturing is propagated to nested settings"() {
+        def project = ProjectBuilder.builder().build()
+        when:
+        project.plugins.apply 'docker-compose'
+        project.dockerCompose {
+            captureContainersOutput = true
+            captureContainersOutputToFiles = project.file('/path/to/directory')
+            nested {
+                useComposeFiles = ['test.yml']
+            }
+        }
+        then:
+        project.dockerCompose.nested.captureContainersOutput.get() == true
+        project.dockerCompose.nested.captureContainersOutputToFiles.get().getAsFile() == project.file('/path/to/directory')
+    }
+
     def "isRequiredBy() adds dependencies"() {
         def project = ProjectBuilder.builder().build()
         project.plugins.apply 'docker-compose'