geedeecee: fix DockerEnvUpdateTask

This commit is contained in:
Adam 2022-10-02 13:57:15 +02:00
parent c01c19a8e2
commit b171f88435
5 changed files with 101 additions and 29 deletions

View file

@ -59,10 +59,12 @@ val kafkatorioServerToken: String by project
tasks.dockerComposeEnvUpdate {
properties(
"FACTORIO_VERSION" to libs.versions.factorio.get(),
"KAFKATORIO_TOKEN" to kafkatorioServerToken,
)
envProperties.put("FACTORIO_VERSION", libs.versions.factorio)
envProperties.put("KAFKATORIO_TOKEN", kafkatorioServerToken)
envProperties {
put("FACTORIO_VERSION" , libs.versions.factorio)
put("KAFKATORIO_TOKEN" , kafkatorioServerToken)
}
}

View file

@ -9,15 +9,16 @@ geedeecee {
}
tasks.dockerComposeEnvUpdate {
properties(
"GRAFANA_VERSION" to libs.versions.grafana,
"PROMETHEUS_VERSION" to libs.versions.prometheus,
"KAFKA_VERSION" to libs.versions.kafka,
"KAFKA_DL_URL" to libs.versions.kafka.map { ver ->
envProperties {
put("GRAFANA_VERSION", libs.versions.grafana)
put("PROMETHEUS_VERSION", libs.versions.prometheus)
put("KAFKA_VERSION", libs.versions.kafka)
put("KAFKA_DL_URL", libs.versions.kafka.map { ver ->
"https://dlcdn.apache.org/kafka/$ver/kafka_2.13-$ver.tgz"
}
})
}
// Limit JVM Heap Size
// Limit JVM Heap Size
// "KAFKA_BROKER_HEAP_OPTS" to "-XX:MaxRAMPercentage=70.0",
// "KAFKA_CONNECT_HEAP_OPTS" to "-XX:MaxRAMPercentage=70.0",
// "SCHEMA_REGISTRY_HEAP_OPTS" to "-XX:MaxRAMPercentage=70.0",
@ -29,7 +30,7 @@ tasks.dockerComposeEnvUpdate {
// "KAFKA_CONNECT_MEM_LIMIT" to "512m",
// "KAFKA_KSQL_MEM_LIMIT" to "256m",
// "SCHEMA_REGISTRY_MEM_LIMIT" to "256m",
)
// )
}
val runKafkaCluster by tasks.registering {

View file

@ -1,6 +1,6 @@
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
import dev.adamko.geedeecee.DockerEnvUpdateTask.Companion.put
plugins {
id("kafkatorio.conventions.lang.kotlin-js")
@ -120,10 +120,10 @@ geedeecee {
}
tasks.dockerComposeEnvUpdate {
properties(
"KAFKATORIO_VERSION" to project.version,
"REGISTRY_HOST" to "dcr.adamko.dev:5000",
)
envProperties {
put("KAFKATORIO_VERSION" to project.version.toString())
put("REGISTRY_HOST" to "dcr.adamko.dev:5000")
}
}
tasks.assemble { dependsOn(tasks.dockerComposeEnvUpdate) }