From 989b95e3a079975595a7d4cb79d15a1d07b87b0f Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Wed, 5 Oct 2022 00:06:46 +0200
Subject: [PATCH] adjust geedeecee config, so images can be built

---
 .../src/main/kotlin/dev/adamko/geedeecee/GDCPlugin.kt  |  2 +-
 modules/infra-factorio-server/build.gradle.kts         | 10 ++++++++--
 modules/infra-kafka-cluster/build.gradle.kts           |  1 +
 modules/infra-kafka-pipe/build.gradle.kts              |  1 +
 modules/versions-platform/build.gradle.kts             |  1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gradle-plugins/docker-compose/src/main/kotlin/dev/adamko/geedeecee/GDCPlugin.kt b/gradle-plugins/docker-compose/src/main/kotlin/dev/adamko/geedeecee/GDCPlugin.kt
index 19f0579..2e78878 100644
--- a/gradle-plugins/docker-compose/src/main/kotlin/dev/adamko/geedeecee/GDCPlugin.kt
+++ b/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,
diff --git a/modules/infra-factorio-server/build.gradle.kts b/modules/infra-factorio-server/build.gradle.kts
index f94e4c2..1aa8bea 100644
--- a/modules/infra-factorio-server/build.gradle.kts
+++ b/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("KAFKATORIO_TOKEN" , kafkatorioServerToken)
+    put("FACTORIO_VERSION", libs.versions.factorio)
+    put("KAFKATORIO_TOKEN", kafkatorioServerToken)
   }
 }
 
diff --git a/modules/infra-kafka-cluster/build.gradle.kts b/modules/infra-kafka-cluster/build.gradle.kts
index e5abad0..d968456 100644
--- a/modules/infra-kafka-cluster/build.gradle.kts
+++ b/modules/infra-kafka-cluster/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+  id("kafkatorio.conventions.base")
   id("dev.adamko.geedeecee")
 }
 
diff --git a/modules/infra-kafka-pipe/build.gradle.kts b/modules/infra-kafka-pipe/build.gradle.kts
index 26bedde..e7ecb5b 100644
--- a/modules/infra-kafka-pipe/build.gradle.kts
+++ b/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")
 }
 
diff --git a/modules/versions-platform/build.gradle.kts b/modules/versions-platform/build.gradle.kts
index 3b2c234..7368657 100644
--- a/modules/versions-platform/build.gradle.kts
+++ b/modules/versions-platform/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+  id("kafkatorio.conventions.base")
   `java-platform`
 }