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

lenient Docker Env properties

Browse source
This commit is contained in:
Adam 2022-12-05 23:20:54 +01:00
parent deefafe255
commit dd9c9500d3
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gradle-plugins/docker-compose/src/main/kotlin/dev/adamko/geedeecee/tasks/DockerEnvUpdateTask.kt
View file

@ -25,6 +25,7 @@ abstract class DockerEnvUpdateTask @Inject constructor(
) : DefaultTask() { ) : DefaultTask() {
@get:Input @get:Input
@get:Optional
abstract val envProperties: MapProperty<String, String> abstract val envProperties: MapProperty<String, String>
@get:Input @get:Input
@ -50,10 +51,11 @@ abstract class DockerEnvUpdateTask @Inject constructor(
val comment: String = comment.orNull val comment: String = comment.orNull
?: " Do not edit manually. This file was created with task '$name'" ?: " Do not edit manually. This file was created with task '$name'"
val envProperties = envProperties.getOrElse(emptyMap())
dotEnvFile.writer(charset).use { writer -> dotEnvFile.writer(charset).use { writer ->
val properties = Properties() val properties = Properties()
properties.putAll(envProperties.get()) properties.putAll(envProperties)
properties.store(writer, comment) properties.store(writer, comment)
} }

6
modules/infra-factorio-server/build.gradle.kts
View file

@ -61,13 +61,15 @@ tasks.dockerComposeUp {
} }
val kafkatorioServerToken: String by project val kafkatorioServerToken: String? by project
tasks.dockerComposeEnvUpdate { tasks.dockerComposeEnvUpdate {
envProperties { envProperties {
put("FACTORIO_VERSION", libs.versions.factorio) put("FACTORIO_VERSION", libs.versions.factorio)
put("KAFKATORIO_TOKEN", kafkatorioServerToken) kafkatorioServerToken?.let { token ->
put("KAFKATORIO_TOKEN", token)
}
} }
} }