From e20f51f44630df5fcd1b1515e70c231ab993d073 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Sun, 9 Jan 2022 11:04:15 +0100 Subject: [PATCH] add project version to docker env --- .../kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts | 1 + modules/infra-factorio-server/src/.env | 1 + modules/infra-kafka-cluster/src/.env | 1 + modules/infra-kafka-pipe/src/.env | 1 + modules/infra-kafka-pipe/src/docker-compose.yml | 1 + modules/infra-kafka-pipe/src/kafka-pipe.sh | 1 + 6 files changed, 6 insertions(+) diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts index b15f05d..a565841 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts @@ -44,6 +44,7 @@ val dockerEnv by tasks.registering(WriteProperties::class) { setOutputFile(dockerSrcDir.file(".env")) properties( "COMPOSE_PROJECT_NAME" to dockerComposeProjectName, + "KAFKATORIO_VERSION" to project.version, ) } diff --git a/modules/infra-factorio-server/src/.env b/modules/infra-factorio-server/src/.env index 9880131..97202e7 100644 --- a/modules/infra-factorio-server/src/.env +++ b/modules/infra-factorio-server/src/.env @@ -1,3 +1,4 @@ # Do not edit manually. This file was created with task 'dockerEnv' COMPOSE_PROJECT_NAME=kafkatorio FACTORIO_VERSION=1.1.50 +KAFKATORIO_VERSION=0.2.1 diff --git a/modules/infra-kafka-cluster/src/.env b/modules/infra-kafka-cluster/src/.env index 6f7d99f..cac708d 100644 --- a/modules/infra-kafka-cluster/src/.env +++ b/modules/infra-kafka-cluster/src/.env @@ -1,2 +1,3 @@ # Do not edit manually. This file was created with task 'dockerEnv' COMPOSE_PROJECT_NAME=kafkatorio +KAFKATORIO_VERSION=0.2.1 diff --git a/modules/infra-kafka-pipe/src/.env b/modules/infra-kafka-pipe/src/.env index 6f7d99f..cac708d 100644 --- a/modules/infra-kafka-pipe/src/.env +++ b/modules/infra-kafka-pipe/src/.env @@ -1,2 +1,3 @@ # Do not edit manually. This file was created with task 'dockerEnv' COMPOSE_PROJECT_NAME=kafkatorio +KAFKATORIO_VERSION=0.2.1 diff --git a/modules/infra-kafka-pipe/src/docker-compose.yml b/modules/infra-kafka-pipe/src/docker-compose.yml index 976eb47..33bfde1 100644 --- a/modules/infra-kafka-pipe/src/docker-compose.yml +++ b/modules/infra-kafka-pipe/src/docker-compose.yml @@ -13,6 +13,7 @@ services: - "kafkatorio-nw" environment: FACTORIO_SERVER_CONTAINER_NAME: "factorio-server" + KAFKATORIO_VERSION: $KAFKATORIO_VERSION KAFKA_HOST: "kafka:29092" volumes: # Windows (requires privileged/root) diff --git a/modules/infra-kafka-pipe/src/kafka-pipe.sh b/modules/infra-kafka-pipe/src/kafka-pipe.sh index a8a8ea9..b155266 100644 --- a/modules/infra-kafka-pipe/src/kafka-pipe.sh +++ b/modules/infra-kafka-pipe/src/kafka-pipe.sh @@ -2,6 +2,7 @@ # Pipe Docker logs from a Factorio server to a Kafka topic +echo "Kafkatorio-Pipe version $KAFKATORIO_VERSION" echo "Piping logs from $FACTORIO_SERVER_CONTAINER_NAME to $KAFKA_HOST" trap endProcess SIGINT