Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display docker command line output. This also ensures the process output... #25

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=se.transmode.gradle
version=1.2
version=1.2.1

# use gradle daemon by default
org.gradle.daemon = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.io.Files

import org.gradle.api.DefaultTask
import org.gradle.api.file.DuplicatesStrategy
import org.gradle.api.logging.Logger
import org.gradle.api.logging.Logging
import org.gradle.api.tasks.TaskAction
Expand Down Expand Up @@ -115,10 +116,7 @@ class DockerTask extends DefaultTask {
target = new File(stageDir, source.name)
}
stageBacklog.add { ->
project.copy {
from source
into target
}
ant.copy(file: source.absolutePath,toDir: target.absolutePath)
}
instructions.add("ADD ${source.name} ${destination}")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,14 @@ class NativeDockerClient implements DockerClient {

private static String executeAndWait(String cmdLine) {
def process = cmdLine.execute()
process.waitFor()
// wait for process, displaying stdout and stderr
process.waitForProcessOutput(System.out,System.err)

if (process.exitValue()) {
throw new GradleException("Docker execution failed\nCommand line [${cmdLine}] returned:\n${process.err.text}")
throw new GradleException("Docker execution failed\nCommand line [${cmdLine}]")
}
return process.in.text

return "Done"
}

}