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

geedeecee: add push task, add KAFKATORIO_VERSION, fix composeProjectVersion, set BUILDKIT_PROGRESS=plain

Browse source
This commit is contained in:
Adam 2022-10-02 14:50:20 +02:00
parent 675b0827d6
commit ae4b122cd4
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gradle-plugins/docker-compose/src/main/kotlin/dev/adamko/geedeecee/GDCCommandTask.kt
View file

@ -33,6 +33,7 @@ abstract class GDCCommandTask @Inject constructor(
val separatedArgs: List<String> = separatedArgs.get() val separatedArgs: List<String> = separatedArgs.get()
executor.exec { executor.exec {
environment("BUILDKIT_PROGRESS", "plain")
workingDir(this@GDCCommandTask.workingDir) workingDir(this@GDCCommandTask.workingDir)
commandLine(separatedArgs) commandLine(separatedArgs)
} }

7
gradle-plugins/docker-compose/src/main/kotlin/dev/adamko/geedeecee/GDCPlugin.kt
View file

@ -46,6 +46,10 @@ abstract class GDCPlugin @Inject constructor(
val dockerComposeBuild by target.tasks.registering(GDCCommandTask::class) { val dockerComposeBuild by target.tasks.registering(GDCCommandTask::class) {
`docker-compose`("build") `docker-compose`("build")
} }
val dockerComposePush by target.tasks.registering(GDCCommandTask::class) {
dependsOn(dockerComposeBuild)
`docker-compose`("push")
}
val dockerComposeRemove by target.tasks.registering(GDCCommandTask::class) { val dockerComposeRemove by target.tasks.registering(GDCCommandTask::class) {
`docker-compose`("rm --stop -v -f") `docker-compose`("rm --stop -v -f")
} }
@ -74,12 +78,13 @@ abstract class GDCPlugin @Inject constructor(
private fun Project.createSettings(): GDCSettings = private fun Project.createSettings(): GDCSettings =
extensions.create<GDCSettings>(GDC_EXTENSION_NAME).apply { extensions.create<GDCSettings>(GDC_EXTENSION_NAME).apply {
composeProjectName.convention(providers.provider { project.name }) composeProjectName.convention(providers.provider { project.name })
composeProjectVersion.convention(providers.provider { project.name }) composeProjectVersion.convention(providers.provider { project.version.toString() })
containerRegistryHost.convention(providers.gradleProperty("dockerContainerRegistryHost")) containerRegistryHost.convention(providers.gradleProperty("dockerContainerRegistryHost"))
srcDir.convention(layout.projectDirectory.dir("docker")) srcDir.convention(layout.projectDirectory.dir("docker"))
dotEnv.put("COMPOSE_PROJECT_NAME", composeProjectName) dotEnv.put("COMPOSE_PROJECT_NAME", composeProjectName)
dotEnv.put("PROJECT_VERSION", composeProjectVersion) dotEnv.put("PROJECT_VERSION", composeProjectVersion)
dotEnv.put("KAFKATORIO_VERSION", composeProjectVersion)
dotEnv.put("REGISTRY_HOST", containerRegistryHost) dotEnv.put("REGISTRY_HOST", containerRegistryHost)
enabled.convention(isDockerActive()) enabled.convention(isDockerActive())