adjust geedeecee config, so images can be built

This commit is contained in:
Adam 2022-10-05 00:06:46 +02:00
parent 144cbba075
commit 989b95e3a0
5 changed files with 12 additions and 3 deletions

View file

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

View file

@ -1,12 +1,18 @@
import dev.adamko.gradle.factorio.FactorioModPlugin import dev.adamko.gradle.factorio.FactorioModPlugin
plugins { plugins {
id("kafkatorio.conventions.base")
id("dev.adamko.geedeecee") id("dev.adamko.geedeecee")
id("dev.adamko.factorio-mod") id("dev.adamko.factorio-mod")
idea idea
} }
geedeecee {
srcDir.set(layout.projectDirectory.dir("src"))
}
//val dockerSrcDir: Directory by extra //val dockerSrcDir: Directory by extra
//val factorioServerDataDir: Directory = dockerSrcDir.dir("factorio-server") //val factorioServerDataDir: Directory = dockerSrcDir.dir("factorio-server")
val factorioServerDataDir: DirectoryProperty = objects.directoryProperty() val factorioServerDataDir: DirectoryProperty = objects.directoryProperty()

View file

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

View file

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

View file

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