Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ jobs:
if: always()
run: |
sudo docker images
echo bitnamilegacy/kafka:latest version:
sudo docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.version\"}}" bitnamilegacy/kafka:latest
echo apache/kafka:latest version:
sudo docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.version\"}}" apache/kafka:latest
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.kafka.ConfluentKafkaContainer;
import org.testcontainers.kafka.KafkaContainer;

import io.openliberty.guides.models.SystemLoad;
import io.openliberty.guides.models.SystemLoad.SystemLoadSerializer;
Expand All @@ -66,8 +66,8 @@ public class InventoryServiceIT {
new ImageFromDockerfile("inventory:1.0-SNAPSHOT")
.withDockerfile(Paths.get("./Dockerfile"));

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.kafka.ConfluentKafkaContainer;
import org.testcontainers.kafka.KafkaContainer;
import org.testcontainers.utility.DockerImageName;

import org.jboss.resteasy.client.jaxrs.ResteasyClient;
Expand Down Expand Up @@ -83,8 +83,8 @@ public class QueryServiceIT {

public static MockServerClient mockClient;

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

Expand Down
16 changes: 8 additions & 8 deletions finish/scripts/startContainers.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ set NETWORK=reactive-app
docker network create %NETWORK%

docker run -d ^
-e ALLOW_PLAINTEXT_LISTENER=yes ^
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 ^
-e KAFKA_CFG_NODE_ID=0 ^
-e KAFKA_CFG_PROCESS_ROLES=controller,broker ^
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 ^
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_NODE_ID=0 ^
-e KAFKA_PROCESS_ROLES=controller,broker ^
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 ^
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 ^
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 ^
--hostname=kafka ^
--network=%NETWORK% ^
--name=kafka ^
--rm ^
bitnamilegacy/kafka:latest
apache/kafka:latest

start /b docker run -d ^
-e MP_MESSAGING_CONNECTOR_LIBERTY_KAFKA_BOOTSTRAP_SERVERS=%KAFKA_SERVER% ^
Expand Down
16 changes: 8 additions & 8 deletions finish/scripts/startContainers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ NETWORK=reactive-app
docker network create $NETWORK

docker run -d \
-e ALLOW_PLAINTEXT_LISTENER=yes \
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 \
-e KAFKA_CFG_NODE_ID=0 \
-e KAFKA_CFG_PROCESS_ROLES=controller,broker \
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 \
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER \
-e KAFKA_NODE_ID=0 \
-e KAFKA_PROCESS_ROLES=controller,broker \
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 \
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 \
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER \
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 \
--hostname=kafka \
--network=$NETWORK \
--name=kafka \
--rm \
bitnamilegacy/kafka:latest
apache/kafka:latest

sleep 15

Expand Down
18 changes: 9 additions & 9 deletions finish/scripts/startKafka.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ set NETWORK=reactive-app
docker network create %NETWORK%

docker run -d ^
-e ALLOW_PLAINTEXT_LISTENER=yes ^
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 ^
-e KAFKA_CFG_NODE_ID=0 ^
-e KAFKA_CFG_PROCESS_ROLES=controller,broker ^
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 ^
-e KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT ^
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_NODE_ID=0 ^
-e KAFKA_PROCESS_ROLES=controller,broker ^
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 ^
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 ^
-e KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT ^
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 ^
-p 9094:9094 ^
--network=%NETWORK% ^
--name=kafka ^
--rm ^
bitnamilegacy/kafka:latest
apache/kafka:latest
20 changes: 10 additions & 10 deletions finish/scripts/startKafka.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ NETWORK=reactive-app
docker network create $NETWORK

docker run -d \
-e ALLOW_PLAINTEXT_LISTENER=yes \
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 \
-e KAFKA_CFG_NODE_ID=0 \
-e KAFKA_CFG_PROCESS_ROLES=controller,broker \
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 \
-e KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT \
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER \
-e KAFKA_NODE_ID=0 \
-e KAFKA_PROCESS_ROLES=controller,broker \
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 \
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 \
-e KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT \
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER \
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 \
-p 9094:9094 \
--network=$NETWORK \
--name=kafka \
--rm \
bitnamilegacy/kafka:latest &

apache/kafka:latest &
wait
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.kafka.ConfluentKafkaContainer;
import org.testcontainers.kafka.KafkaContainer;

import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerRecord;
Expand All @@ -56,8 +56,8 @@ public class SystemServiceIT {
new ImageFromDockerfile("system:1.0-SNAPSHOT")
.withDockerfile(Paths.get("./Dockerfile"));

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

Expand Down
2 changes: 1 addition & 1 deletion scripts/testApp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set -euxo pipefail

./scripts/buildImages.sh

docker pull -q "bitnamilegacy/kafka:latest"
docker pull -q "apache/kafka:latest"

./scripts/startContainers.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.kafka.ConfluentKafkaContainer;
import org.testcontainers.kafka.KafkaContainer;

import io.openliberty.guides.models.SystemLoad;
import io.openliberty.guides.models.SystemLoad.SystemLoadSerializer;
Expand All @@ -65,8 +65,8 @@ public class InventoryServiceIT {
new ImageFromDockerfile("inventory:1.0-SNAPSHOT")
.withDockerfile(Paths.get("./Dockerfile"));

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

Expand Down
16 changes: 8 additions & 8 deletions start/scripts/startContainers.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ set NETWORK=reactive-app
docker network create %NETWORK%

docker run -d ^
-e ALLOW_PLAINTEXT_LISTENER=yes ^
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 ^
-e KAFKA_CFG_NODE_ID=0 ^
-e KAFKA_CFG_PROCESS_ROLES=controller,broker ^
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 ^
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_NODE_ID=0 ^
-e KAFKA_PROCESS_ROLES=controller,broker ^
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 ^
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 ^
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 ^
--hostname=kafka ^
--network=%NETWORK% ^
--name=kafka ^
--rm ^
bitnamilegacy/kafka:latest
apache/kafka:latest

start /b docker run -d ^
-e MP_MESSAGING_CONNECTOR_LIBERTY_KAFKA_BOOTSTRAP_SERVERS=%KAFKA_SERVER% ^
Expand Down
16 changes: 8 additions & 8 deletions start/scripts/startContainers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ NETWORK=reactive-app
docker network create $NETWORK

docker run -d \
-e ALLOW_PLAINTEXT_LISTENER=yes \
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 \
-e KAFKA_CFG_NODE_ID=0 \
-e KAFKA_CFG_PROCESS_ROLES=controller,broker \
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 \
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER \
-e KAFKA_NODE_ID=0 \
-e KAFKA_PROCESS_ROLES=controller,broker \
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 \
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 \
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER \
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 \
--hostname=kafka \
--network=$NETWORK \
--name=kafka \
--rm \
bitnamilegacy/kafka:latest
apache/kafka:latest

sleep 15

Expand Down
18 changes: 9 additions & 9 deletions start/scripts/startKafka.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ set NETWORK=reactive-app
docker network create %NETWORK%

docker run -d ^
-e ALLOW_PLAINTEXT_LISTENER=yes ^
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 ^
-e KAFKA_CFG_NODE_ID=0 ^
-e KAFKA_CFG_PROCESS_ROLES=controller,broker ^
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 ^
-e KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT ^
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_NODE_ID=0 ^
-e KAFKA_PROCESS_ROLES=controller,broker ^
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 ^
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 ^
-e KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT ^
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 ^
-p 9094:9094 ^
--network=%NETWORK% ^
--name=kafka ^
--rm ^
bitnamilegacy/kafka:latest
apache/kafka:latest
18 changes: 9 additions & 9 deletions start/scripts/startKafka.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ NETWORK=reactive-app
docker network create $NETWORK

docker run -d \
-e ALLOW_PLAINTEXT_LISTENER=yes \
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 \
-e KAFKA_CFG_NODE_ID=0 \
-e KAFKA_CFG_PROCESS_ROLES=controller,broker \
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 \
-e KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT \
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER \
-e KAFKA_NODE_ID=0 \
-e KAFKA_PROCESS_ROLES=controller,broker \
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 \
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 \
-e KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT \
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER \
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 \
-p 9094:9094 \
--network=$NETWORK \
--name=kafka \
--rm \
bitnamilegacy/kafka:latest &
apache/kafka:latest &

wait
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.kafka.ConfluentKafkaContainer;
import org.testcontainers.kafka.KafkaContainer;

import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerRecord;
Expand All @@ -56,8 +56,8 @@ public class SystemServiceIT {
new ImageFromDockerfile("system:1.0-SNAPSHOT")
.withDockerfile(Paths.get("./Dockerfile"));

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

Expand Down