From 83757035d11119430e6f29f36ce77c1ba01f9cbb Mon Sep 17 00:00:00 2001
From: Haifeng Chen <chenhaifeng88888@gmail.com>
Date: Thu, 11 Apr 2024 21:23:17 -0700
Subject: [PATCH] Polish UForwarder quick start

---
 README.md                        | 16 ++++++++++++----
 uforwarder-image/docker/build.sh |  2 +-
 uforwarder/build.gradle          |  3 +++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 6ac0c6a..981aa2f 100644
--- a/README.md
+++ b/README.md
@@ -79,18 +79,26 @@ For an overview of the project, please read the Uber Engineering blog [Enabling
 docker network create docker-network
 ```
 
-2. Start Zookeeper and Kafka broker
+2. Start Zookeeper
 
 ```
 docker run --env ALLOW_ANONYMOUS_LOGIN=yes --network docker-network -p 2181:2181 --name zookeeper zookeeper:3.8.0
+```
+
+3. Start Kafka broker
+```
 docker run --env KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 --env KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 --env KAFKA_LISTENERS=DOCKER://0.0.0.0:9092,HOSTER://0.0.0.0:9093 --env KAFKA_ADVERTISED_LISTENERS=DOCKER://kafka:9092,HOSTER://localhost:9093 -e KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=DOCKER:PLAINTEXT,HOSTER:PLAINTEXT -e KAFKA_INTER_BROKER_LISTENER_NAME=DOCKER --network docker-network -p 9093:9093 --name kafka confluentinc/cp-kafka:5.2.1
 ```
 
-3. Run Uforwarder controller and worker
+4. Run UForwarder controller
+
+```
+docker run --env UFORWARDER_PROFILE=uforwarder-controller --env UFORWARDER_KAFKA_CONNECT=kafka:9092 --env UFORWARDER_ZOOKEEPER_CONNECT=zookeeper:2181/uforwarder --network docker-network --name controller -p 8087:8087 uforwarder:0.1
+```
 
+5. Run UForwarder worker
 ```
-docker run --env UFORWARDER_PROFILE=uforwarder-controller --env UFORWARDER_KAFKA_CONNECT=kafka:9092 --env UFORWARDER_ZOOKEEPER_CONNECT=zookeeper:2181/uforwarder --network docker-network --name controller -p 8087:8087 uforwarder:latest
-docker run --env UFORWARDER_PROFILE=uforwarder-worker --env UFORWARDER_KAFKA_CONNECT=kafka:9092 --env UFORWARDER_CONTROLLER_CONNECT=controller:8087 --network docker-network --name worker uforwarder:latest
+docker run --env UFORWARDER_PROFILE=uforwarder-worker --env UFORWARDER_KAFKA_CONNECT=kafka:9092 --env UFORWARDER_CONTROLLER_CONNECT=controller:8087 --network docker-network --name worker uforwarder:0.1
 ```
 
 4. Run Sample Consumer
diff --git a/uforwarder-image/docker/build.sh b/uforwarder-image/docker/build.sh
index c915a2a..e8acdf3 100755
--- a/uforwarder-image/docker/build.sh
+++ b/uforwarder-image/docker/build.sh
@@ -8,7 +8,7 @@ clean_up () {
 trap clean_up EXIT
 
 # copy executable from binary output dir to local folder
-cp ../../../../buck-out/gen/data/kafka/uforwarder/bin_main.jar .
+cp ../../uforwarder/build/libs/uforwarder-0.1-SNAPSHOT.jar ./bin_main.jar
 
 # build docker image uforwarder:latest
 docker build -t uforwarder:0.1 .
diff --git a/uforwarder/build.gradle b/uforwarder/build.gradle
index f3fb7ae..86c9e1d 100644
--- a/uforwarder/build.gradle
+++ b/uforwarder/build.gradle
@@ -66,6 +66,9 @@ tasks.named("bootJar") {
 
 tasks.named("jar") {
     archiveClassifier = ''
+    manifest {
+        attributes 'Main-Class': 'com.uber.data.kafka.consumerproxy.UForwarder'
+    }
 }
 
 tasks.register('testJar', Jar) {