mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6927 from alvasw/gradle_report_docker_progress

Browse source 
DockerBuildTask: Report Progress
This commit is contained in:
Alejandro García 2023-10-19 13:04:46 +00:00 • committed by GitHub
commit 5351637a53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build-logic/docker-image-builder/src/main/java/bisq/gradle/docker/image_builder/DockerBuildTask.kt
View file

@ -6,7 +6,6 @@ import org.gradle.api.provider.Property
import org.gradle.api.tasks.Input import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputDirectory import org.gradle.api.tasks.InputDirectory
import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.TaskAction
import java.util.concurrent.TimeUnit
abstract class DockerBuildTask : DefaultTask() { abstract class DockerBuildTask : DefaultTask() {
@ -27,7 +26,17 @@ abstract class DockerBuildTask : DefaultTask() {
processBuilder.redirectErrorStream(true) processBuilder.redirectErrorStream(true)
val process = processBuilder.start() val process = processBuilder.start()
val isSuccess = process.waitFor(2, TimeUnit.MINUTES) && process.exitValue() == 0 // Report Progress
process.inputStream
.bufferedReader()
.use { bufferedReader ->
while (true) {
val line = bufferedReader.readLine() ?: return@use
println(line)
}
}
val isSuccess = process.waitFor() == 0
if (!isSuccess) { if (!isSuccess) {
throw IllegalStateException("Couldn't build docker image.") throw IllegalStateException("Couldn't build docker image.")
} }

4
build-logic/docker-image-builder/src/main/java/bisq/gradle/docker/image_builder/DockerImageBuilderPlugin.kt
View file

@ -26,7 +26,7 @@ class DockerImageBuilderPlugin : Plugin<Project> {
into(seednodeBuildDir) into(seednodeBuildDir)
} }
project.tasks.register<CreateDockerfileTask>("generateDockerfile") { val generateDockerFileTask = project.tasks.register<CreateDockerfileTask>("generateDockerfile") {
archiveFileName.set(distTarTask.flatMap { it.archiveFileName }) archiveFileName.set(distTarTask.flatMap { it.archiveFileName })
val classpathFiles: Provider<List<String>> = installDistTask.map { syncTask -> val classpathFiles: Provider<List<String>> = installDistTask.map { syncTask ->
@ -40,7 +40,7 @@ class DockerImageBuilderPlugin : Plugin<Project> {
} }
project.tasks.register<DockerBuildTask>("seednodeDockerImage") { project.tasks.register<DockerBuildTask>("seednodeDockerImage") {
dependsOn(copyTask) dependsOn(copyTask, generateDockerFileTask)
imageTag.set("bisq/seednode:latest") imageTag.set("bisq/seednode:latest")
dockerDirectory.set(seednodeBuildDir) dockerDirectory.set(seednodeBuildDir)
} }