lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump project to 0.7.0 (and fix docker .env task for all docker .envs)

Browse source
This commit is contained in:
Adam 2022-07-06 17:40:21 +02:00
parent 5fcb831df2
commit 665327e010
16 changed files with 78 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
buildSrc/src/main/kotlin/dev/adamko/kafkatorio/gradle/extensions.kt
View file

@ -91,3 +91,6 @@ fun Project.taskProvider(taskName: String): Provider<Task> = providers.provider
}.flatMap {
tasks.named(it)
}
const val DOCKER_COMPOSE_TASK_GROUP = "docker-compose"

21
buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts
View file

@ -1,5 +1,7 @@
package dev.adamko.kafkatorio.infra
import dev.adamko.kafkatorio.gradle.DOCKER_COMPOSE_TASK_GROUP
import dev.adamko.kafkatorio.task.DockerEnvUpdateTask
import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs
plugins {
@ -7,14 +9,13 @@ plugins {
id("dev.adamko.kafkatorio.infra.process-runner")
}
val dockerComposeTaskGroup: String by extra("docker-compose")
val dockerComposeProjectName: String by extra(rootProject.name)
val dockerSrcDir: Directory by extra(layout.projectDirectory.dir("src"))
val dockerUp by tasks.registering(Exec::class) {
group = dockerComposeTaskGroup
group = DOCKER_COMPOSE_TASK_GROUP
dependsOn(tasks.assemble)
logging.captureStandardOutput(LogLevel.LIFECYCLE)
@ -25,7 +26,7 @@ val dockerUp by tasks.registering(Exec::class) {
val dockerDown by tasks.registering(Exec::class) {
group = dockerComposeTaskGroup
group = DOCKER_COMPOSE_TASK_GROUP
logging.captureStandardOutput(LogLevel.LIFECYCLE)
@ -35,7 +36,7 @@ val dockerDown by tasks.registering(Exec::class) {
val dockerRemove by tasks.registering(Exec::class) {
group = dockerComposeTaskGroup
group = DOCKER_COMPOSE_TASK_GROUP
logging.captureStandardOutput(LogLevel.LIFECYCLE)
@ -45,17 +46,13 @@ val dockerRemove by tasks.registering(Exec::class) {
afterEvaluate {
tasks.named("processRun") { dependsOn(dockerUp, dockerEnv) }
tasks.named("processRun") { dependsOn(dockerUp, dockerEnvUpdate) }
tasks.named("processKill") { dependsOn(dockerDown) }
}
val dockerEnv by tasks.registering(WriteProperties::class) {
group = dockerComposeTaskGroup
logging.captureStandardOutput(LogLevel.LIFECYCLE)
setOutputFile(dockerSrcDir.file(".env"))
val dockerEnvUpdate by tasks.registering(DockerEnvUpdateTask::class) {
dotEnvFile.set(dockerSrcDir.file(".env"))
properties(
"COMPOSE_PROJECT_NAME" to dockerComposeProjectName,
@ -64,4 +61,4 @@ val dockerEnv by tasks.registering(WriteProperties::class) {
}
tasks.assemble { dependsOn(dockerEnv) }
tasks.assemble { dependsOn(dockerEnvUpdate) }

27
buildSrc/src/main/kotlin/dev/adamko/kafkatorio/task/DockerEnvUpdateTask.kt Normal file
View file

@ -0,0 +1,27 @@
package dev.adamko.kafkatorio.task
import dev.adamko.kafkatorio.gradle.DOCKER_COMPOSE_TASK_GROUP
import javax.inject.Inject
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.logging.LogLevel
import org.gradle.api.model.ObjectFactory
import org.gradle.api.tasks.CacheableTask
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.WriteProperties
@CacheableTask
open class DockerEnvUpdateTask @Inject constructor(
private val objects: ObjectFactory
) : WriteProperties() {
@Internal
val dotEnvFile: RegularFileProperty = objects.fileProperty()
init {
group = DOCKER_COMPOSE_TASK_GROUP
super.setOutputFile(dotEnvFile)
super.getLogging().captureStandardOutput(LogLevel.LIFECYCLE)
}
}