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

create and use APP_NAME, APP_GROUP in docker compose files

Browse source
This commit is contained in:
Adam 2022-10-04 22:27:43 +02:00
parent 3758906bb8
commit 0044f0cb98
10 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,6 +83,8 @@ abstract class GDCPlugin @Inject constructor(
srcDir.convention(layout.projectDirectory.dir("docker"))
dotEnv.put("COMPOSE_PROJECT_NAME", composeProjectName)
dotEnv.put("APP_NAME", providers.provider { project.name })
dotEnv.put("APP_GROUP", providers.provider { project.group.toString() })
dotEnv.put("PROJECT_VERSION", composeProjectVersion)
dotEnv.put("KAFKATORIO_VERSION", composeProjectVersion)
dotEnv.put("REGISTRY_HOST", containerRegistryHost)

1
modules/events-processors/docker/Dockerfile
View file

@ -3,6 +3,7 @@
FROM eclipse-temurin:11-jdk-jammy
ARG KAFKATORIO_VERSION=0.5.1
ARG DIST_DIR="../build/distributions/"
ARG APP_NAME="events-server-web"
WORKDIR /app

5
modules/events-processors/docker/docker-compose.yml
View file

@ -3,8 +3,8 @@ version: "3.9"
services:
events-server:
image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/events-processors:${KAFKATORIO_VERSION}
container_name: events-server
image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
container_name: ${APP_NAME}
restart: unless-stopped
build:
context: ..
@ -12,6 +12,7 @@ services:
args:
KAFKATORIO_VERSION: ${KAFKATORIO_VERSION}
DIST_DIR: "./build/distributions/"
APP_NAME: ${APP_NAME}
environment:
KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
# KAFKA_STREAMS_STATE_DIR: ""

7
modules/events-server-syslog/docker/docker-compose.yml
View file

@ -2,9 +2,9 @@ version: "3.9"
services:
events-server:
image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/events-server-syslog:${KAFKATORIO_VERSION}
container_name: events-server
events-server-syslog:
image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
container_name: ${APP_NAME}
restart: unless-stopped
build:
context: ..
@ -12,6 +12,7 @@ services:
args:
KAFKATORIO_VERSION: ${KAFKATORIO_VERSION}
DIST_DIR: "./build/distributions/"
APP_NAME: ${APP_NAME}
environment:
KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
# KAFKA_STREAMS_STATE_DIR: ""

5
modules/events-server-web/docker/docker-compose.yml
View file

@ -3,8 +3,8 @@ version: "3.9"
services:
events-server-web:
image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/events-server-web:${KAFKATORIO_VERSION}
container_name: events-server-web
image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
container_name: ${APP_NAME}
restart: unless-stopped
build:
context: ..
@ -12,6 +12,7 @@ services:
args:
KAFKATORIO_VERSION: ${KAFKATORIO_VERSION}
DIST_DIR: "./build/distributions/"
APP_NAME: ${APP_NAME}
environment:
KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
# KAFKA_STREAMS_STATE_DIR: ""

5
modules/events-server/docker/docker-compose.yml
View file

@ -3,8 +3,8 @@ version: "3.9"
services:
events-server:
image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/events-server:${KAFKATORIO_VERSION}
container_name: events-server
image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
container_name: ${APP_NAME}
restart: unless-stopped
build:
context: ..
@ -12,6 +12,7 @@ services:
args:
KAFKATORIO_VERSION: ${KAFKATORIO_VERSION}
DIST_DIR: "./build/distributions/"
APP_NAME: ${APP_NAME}
environment:
KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
# KAFKA_STREAMS_STATE_DIR: ""

1
modules/infra-kafka-cluster/build.gradle.kts
View file

@ -16,6 +16,7 @@ tasks.dockerComposeEnvUpdate {
put("KAFKA_DL_URL", libs.versions.kafka.map { ver ->
"https://dlcdn.apache.org/kafka/$ver/kafka_2.13-$ver.tgz"
})
put("APP_NAME", "kafka-kraft")
}
// Limit JVM Heap Size

2
modules/infra-kafka-cluster/src/docker-compose.yml
View file

@ -3,7 +3,7 @@ version: "3.9"
services:
kafka:
image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/kafka-kraft:${KAFKA_VERSION}
image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
container_name: "kafka"
restart: "unless-stopped"
build:

6
modules/infra-kafka-pipe/src/docker-compose.yml
View file

@ -2,11 +2,13 @@ version: "3.9"
services:
kafka-pipe:
image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/kafka-pipe/${KAFKATORIO_VERSION}
container_name: "kafka-pipe"
image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
container_name: ${APP_NAME}
build:
dockerfile: "kafka-pipe.Dockerfile"
context: "."
args:
APP_NAME: ${APP_NAME}
restart: "unless-stopped"
privileged: true
networks:

6
modules/web-map/docker/docker-compose.yml
View file

@ -3,12 +3,14 @@ version: "3.9"
services:
kafkatorio-web-map:
image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/web-map:${KAFKATORIO_VERSION}
container_name: kafkatorio-web-map
image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
container_name: ${APP_NAME}
restart: unless-stopped
build:
context: ".."
dockerfile: ./docker/Dockerfile
args:
APP_NAME: ${APP_NAME}
ports:
- "12081:80"
networks: