Skip to content

Commit 4923a62

Browse files
Update the guide to use the official Apache Kafka Docker image (#346)
Co-authored-by: Gilbert Kwan <[email protected]>
1 parent 0fa3109 commit 4923a62

File tree

18 files changed

+131
-135
lines changed

18 files changed

+131
-135
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ jobs:
5858
if: always()
5959
run: |
6060
sudo docker images
61-
echo bitnamilegacy/kafka:latest version:
62-
sudo docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.version\"}}" bitnamilegacy/kafka:latest
61+
echo apache/kafka:latest version:
62+
sudo docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.version\"}}" apache/kafka:latest

finish/inventory/src/test/java/it/io/openliberty/guides/inventory/InventoryServiceIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.testcontainers.containers.wait.strategy.Wait;
4848
import org.testcontainers.images.builder.ImageFromDockerfile;
4949
import org.testcontainers.junit.jupiter.Testcontainers;
50-
import org.testcontainers.kafka.ConfluentKafkaContainer;
50+
import org.testcontainers.kafka.KafkaContainer;
5151

5252
import io.openliberty.guides.models.SystemLoad;
5353
import io.openliberty.guides.models.SystemLoad.SystemLoadSerializer;
@@ -73,8 +73,8 @@ public class InventoryServiceIT {
7373
new ImageFromDockerfile("inventory:1.0-SNAPSHOT")
7474
.withDockerfile(Paths.get("./Dockerfile"));
7575

76-
private static ConfluentKafkaContainer kafkaContainer =
77-
new ConfluentKafkaContainer("confluentinc/cp-kafka:latest")
76+
private static KafkaContainer kafkaContainer =
77+
new KafkaContainer("apache/kafka:latest")
7878
.withListener("kafka:19092")
7979
.withNetwork(network);
8080

finish/scripts/buildImages.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@ECHO Starting Scripts
22
@ECHO OFF
33

4-
start /b docker pull bitnamilegacy/kafka:latest
4+
start /b docker pull apache/kafka:latest
55

66
start /b docker build -q -t system:1.0-SNAPSHOT system\.
77
start /b docker build -q -t inventory:1.0-SNAPSHOT inventory\.

finish/scripts/buildImages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
echo Pull kafka images
4-
docker pull -q bitnamilegacy/kafka:latest
4+
docker pull -q apache/kafka:latest
55

66
echo Building images
77
docker build -t system:1.0-SNAPSHOT system/. &

finish/scripts/startContainers.bat

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ set NETWORK=reactive-app
55
docker network create %NETWORK%
66

77
docker run -d ^
8-
-e ALLOW_PLAINTEXT_LISTENER=yes ^
9-
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 ^
10-
-e KAFKA_CFG_NODE_ID=0 ^
11-
-e KAFKA_CFG_PROCESS_ROLES=controller,broker ^
12-
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 ^
13-
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
14-
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
8+
-e KAFKA_NODE_ID=0 ^
9+
-e KAFKA_PROCESS_ROLES=controller,broker ^
10+
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 ^
11+
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 ^
12+
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
13+
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
14+
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 ^
1515
--hostname=kafka ^
1616
--network=%NETWORK% ^
1717
--name=kafka ^
1818
--rm ^
19-
bitnamilegacy/kafka:latest
19+
apache/kafka:latest
2020

2121
start /b docker run -d ^
2222
-e MP_MESSAGING_CONNECTOR_LIBERTY_KAFKA_BOOTSTRAP_SERVERS=%KAFKA_SERVER% ^

finish/scripts/startContainers.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ NETWORK=reactive-app
66
docker network create $NETWORK
77

88
docker run -d \
9-
-e ALLOW_PLAINTEXT_LISTENER=yes \
10-
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 \
11-
-e KAFKA_CFG_NODE_ID=0 \
12-
-e KAFKA_CFG_PROCESS_ROLES=controller,broker \
13-
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 \
14-
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
15-
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER \
16-
--hostname=kafka \
17-
--network=$NETWORK \
18-
--name=kafka \
19-
--rm \
20-
bitnamilegacy/kafka:latest
9+
-e KAFKA_NODE_ID=0 \
10+
-e KAFKA_PROCESS_ROLES=controller,broker \
11+
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 \
12+
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 \
13+
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
14+
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER \
15+
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 \
16+
--hostname=kafka \
17+
--network=$NETWORK \
18+
--name=kafka \
19+
--rm \
20+
apache/kafka:latest
2121

2222
sleep 15
2323

@@ -29,7 +29,7 @@ docker run -d \
2929
--name=system \
3030
--rm \
3131
system:1.0-SNAPSHOT &
32-
32+
3333
docker run -d \
3434
-e MP_MESSAGING_CONNECTOR_LIBERTY_KAFKA_BOOTSTRAP_SERVERS=$KAFKA_SERVER \
3535
-e WLP_LOGGING_CONSOLE_LOGLEVEL=info \
@@ -38,5 +38,5 @@ docker run -d \
3838
--name=inventory \
3939
--rm \
4040
inventory:1.0-SNAPSHOT &
41-
41+
4242
wait

finish/scripts/startKafka.bat

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ set NETWORK=reactive-app
55
docker network create %NETWORK%
66

77
docker run -d ^
8-
-e ALLOW_PLAINTEXT_LISTENER=yes ^
9-
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 ^
10-
-e KAFKA_CFG_NODE_ID=0 ^
11-
-e KAFKA_CFG_PROCESS_ROLES=controller,broker ^
12-
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 ^
13-
-e KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT ^
14-
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
15-
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
8+
-e KAFKA_NODE_ID=0 ^
9+
-e KAFKA_PROCESS_ROLES=controller,broker ^
10+
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 ^
11+
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 ^
12+
-e KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT ^
13+
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
14+
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
15+
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 ^
1616
-p 9094:9094 ^
1717
--network=%NETWORK% ^
1818
--name=kafka ^
1919
--rm ^
20-
bitnamilegacy/kafka:latest
20+
apache/kafka:latest

finish/scripts/startKafka.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ NETWORK=reactive-app
55
docker network create $NETWORK
66

77
docker run -d \
8-
-e ALLOW_PLAINTEXT_LISTENER=yes \
9-
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 \
10-
-e KAFKA_CFG_NODE_ID=0 \
11-
-e KAFKA_CFG_PROCESS_ROLES=controller,broker \
12-
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 \
13-
-e KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT \
14-
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
15-
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER \
8+
-e KAFKA_NODE_ID=0 \
9+
-e KAFKA_PROCESS_ROLES=controller,broker \
10+
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 \
11+
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 \
12+
-e KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT \
13+
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
14+
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER \
15+
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 \
1616
-p 9094:9094 \
1717
--network=$NETWORK \
1818
--name=kafka \
1919
--rm \
20-
bitnamilegacy/kafka:latest &
20+
apache/kafka:latest &
2121

2222
wait

finish/system/src/test/java/it/io/openliberty/guides/system/SystemServiceIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.testcontainers.images.builder.ImageFromDockerfile;
3636
import org.testcontainers.containers.GenericContainer;
3737
import org.testcontainers.containers.output.Slf4jLogConsumer;
38-
import org.testcontainers.kafka.ConfluentKafkaContainer;
38+
import org.testcontainers.kafka.KafkaContainer;
3939

4040
import org.apache.kafka.clients.consumer.ConsumerConfig;
4141
import org.apache.kafka.clients.consumer.ConsumerRecord;
@@ -69,8 +69,8 @@ public class SystemServiceIT {
6969
new ImageFromDockerfile("system:1.0-SNAPSHOT")
7070
.withDockerfile(Paths.get("./Dockerfile"));
7171

72-
private static ConfluentKafkaContainer kafkaContainer =
73-
new ConfluentKafkaContainer("confluentinc/cp-kafka:latest")
72+
private static KafkaContainer kafkaContainer =
73+
new KafkaContainer("apache/kafka:latest")
7474
.withListener("kafka:19092")
7575
.withNetwork(network);
7676

scripts/testApp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -euxo pipefail
77
./mvnw -ntp -pl system verify
88
./mvnw -ntp -pl inventory verify
99

10-
docker pull -q "bitnamilegacy/kafka:latest"
10+
docker pull -q "apache/kafka:latest"
1111

1212
./scripts/buildImages.sh
1313
./scripts/startContainers.sh

0 commit comments

Comments
 (0)