adjust geedeecee config, so images can be built

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

@@ -26,7 +26,7 @@ abstract class GDCPlugin @Inject constructor(
     val dockerComposeEnvUpdate by target.tasks.registering(DockerEnvUpdateTask::class) {
       dotEnvFile.set(gdcSettings.srcDir.file(".env"))
 
-      envProperties.convention(gdcSettings.dotEnv)
+      envProperties.putAll(gdcSettings.dotEnv)
 //      properties(
 //        "COMPOSE_PROJECT_NAME" to gdcSettings.composeProjectName,
 //        "KAFKATORIO_VERSION" to gdcSettings.composeProjectVersion,

modules/infra-factorio-server/build.gradle.kts

@@ -1,12 +1,18 @@
 import dev.adamko.gradle.factorio.FactorioModPlugin
 
 plugins {
+  id("kafkatorio.conventions.base")
   id("dev.adamko.geedeecee")
   id("dev.adamko.factorio-mod")
   idea
 }
 
 
+geedeecee {
+  srcDir.set(layout.projectDirectory.dir("src"))
+}
+
+
 //val dockerSrcDir: Directory by extra
 //val factorioServerDataDir: Directory = dockerSrcDir.dir("factorio-server")
 val factorioServerDataDir: DirectoryProperty = objects.directoryProperty()
@@ -62,8 +68,8 @@ tasks.dockerComposeEnvUpdate {
   envProperties.put("FACTORIO_VERSION", libs.versions.factorio)
   envProperties.put("KAFKATORIO_TOKEN", kafkatorioServerToken)
   envProperties {
-    put("FACTORIO_VERSION" , libs.versions.factorio)
+    put("FACTORIO_VERSION", libs.versions.factorio)
-    put("KAFKATORIO_TOKEN" , kafkatorioServerToken)
+    put("KAFKATORIO_TOKEN", kafkatorioServerToken)
   }
 }
 

modules/infra-kafka-cluster/build.gradle.kts

@@ -1,4 +1,5 @@
 plugins {
+  id("kafkatorio.conventions.base")
   id("dev.adamko.geedeecee")
 }
 

modules/infra-kafka-pipe/build.gradle.kts

@@ -1,6 +1,7 @@
 import dev.adamko.geedeecee.DockerComposeExec
 
 plugins {
+  id("kafkatorio.conventions.base")
   id("dev.adamko.geedeecee")
 }
 

modules/versions-platform/build.gradle.kts

@@ -1,4 +1,5 @@
 plugins {
+  id("kafkatorio.conventions.base")
   `java-platform`
 }