From a1af3d50a397abaa01959bbb102e402a6da61aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <post@soeren-henning.de>
Date: Thu, 26 Mar 2020 19:29:36 +0100
Subject: [PATCH] Fix Docker setup and main class ref
---
.../uc4-docker-compose/docker-compose.yml | 15 +++++++++++++--
uc4-workload-generator/Dockerfile | 6 +++---
uc4-workload-generator/build.gradle | 2 +-
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Deployment/docker-compose/uc4-docker-compose/docker-compose.yml b/Deployment/docker-compose/uc4-docker-compose/docker-compose.yml
index 3347cfa9d..be945cefe 100755
--- a/Deployment/docker-compose/uc4-docker-compose/docker-compose.yml
+++ b/Deployment/docker-compose/uc4-docker-compose/docker-compose.yml
@@ -15,11 +15,22 @@ services:
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_ZOOKEEPER_CONNECTION_TIMEOUT_MS: 30000
KAFKA_CREATE_TOPICS: "input:3:1,output:3:1,configuration:3:1,aggregation-feedback:3:1,dayofweek:3:1,hourofday:3:1,hourofweek:3:1"
+ schema-registry:
+ image: confluentinc/cp-schema-registry:5.3.1
+ depends_on:
+ - zookeeper
+ - kafka
+ expose:
+ - "8081"
+ environment:
+ SCHEMA_REGISTRY_HOST_NAME: schema-registry
+ SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
uc-app:
- image: benediktwetzel/uc2-app:latest #TODO
+ image: soerenhenning/uc4-app:latest #TODO
environment:
KAFKA_BOOTSTRAP_SERVERS: kafka:9092
+ SCHEMA_REGISTRY_URL: http://schema-registry:8081
uc-wg:
- image: benediktwetzel/uc2-wg:latest #TODO
+ image: soerenhenning/uc4-wg:latest #TODO
environment:
KAFKA_BOOTSTRAP_SERVERS: kafka:9092
diff --git a/uc4-workload-generator/Dockerfile b/uc4-workload-generator/Dockerfile
index 9b17de3af..8f077637a 100644
--- a/uc4-workload-generator/Dockerfile
+++ b/uc4-workload-generator/Dockerfile
@@ -1,6 +1,6 @@
FROM openjdk:11-slim
-ADD build/distributions/exp-bigdata19-bridge.tar /
+ADD build/distributions/uc4-workload-generator.tar /
-CMD export JAVA_OPTS=-Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL \
- && /exp-bigdata19-bridge/bin/exp-bigdata19-bridge
\ No newline at end of file
+CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
+ /uc4-workload-generator/bin/uc4-workload-generator
diff --git a/uc4-workload-generator/build.gradle b/uc4-workload-generator/build.gradle
index 12e597b37..5902b6307 100644
--- a/uc4-workload-generator/build.gradle
+++ b/uc4-workload-generator/build.gradle
@@ -21,7 +21,7 @@ dependencies {
testCompile 'junit:junit:4.12'
}
-mainClassName = "titan.ccp.kiekerbridge.expbigdata19.ExperimentorBigData"
+mainClassName = "uc4.workloadGenerator.LoadGenerator"
eclipse {
classpath {
--
GitLab