diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b28a4dc..26da28a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/finish/inventory/src/test/java/it/io/openliberty/guides/inventory/InventoryServiceIT.java b/finish/inventory/src/test/java/it/io/openliberty/guides/inventory/InventoryServiceIT.java index 83e4871..176c95a 100644 --- a/finish/inventory/src/test/java/it/io/openliberty/guides/inventory/InventoryServiceIT.java +++ b/finish/inventory/src/test/java/it/io/openliberty/guides/inventory/InventoryServiceIT.java @@ -47,7 +47,7 @@ import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.images.builder.ImageFromDockerfile; import org.testcontainers.junit.jupiter.Testcontainers; -import org.testcontainers.kafka.ConfluentKafkaContainer; +import org.testcontainers.kafka.KafkaContainer; import io.openliberty.guides.models.SystemLoad; import io.openliberty.guides.models.SystemLoad.SystemLoadSerializer; @@ -73,8 +73,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); diff --git a/finish/scripts/buildImages.bat b/finish/scripts/buildImages.bat index ce1ed88..4f09e5e 100644 --- a/finish/scripts/buildImages.bat +++ b/finish/scripts/buildImages.bat @@ -1,7 +1,7 @@ @ECHO Starting Scripts @ECHO OFF -start /b docker pull bitnamilegacy/kafka:latest +start /b docker pull apache/kafka:latest start /b docker build -q -t system:1.0-SNAPSHOT system\. start /b docker build -q -t inventory:1.0-SNAPSHOT inventory\. diff --git a/finish/scripts/buildImages.sh b/finish/scripts/buildImages.sh index d7b3332..05c30f1 100755 --- a/finish/scripts/buildImages.sh +++ b/finish/scripts/buildImages.sh @@ -1,7 +1,7 @@ #!/bin/bash echo Pull kafka images -docker pull -q bitnamilegacy/kafka:latest +docker pull -q apache/kafka:latest echo Building images docker build -t system:1.0-SNAPSHOT system/. & diff --git a/finish/scripts/startContainers.bat b/finish/scripts/startContainers.bat index 2bd880a..3a9a60a 100644 --- a/finish/scripts/startContainers.bat +++ b/finish/scripts/startContainers.bat @@ -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% ^ diff --git a/finish/scripts/startContainers.sh b/finish/scripts/startContainers.sh index a491399..dd7ae01 100755 --- a/finish/scripts/startContainers.sh +++ b/finish/scripts/startContainers.sh @@ -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 \ - --hostname=kafka \ - --network=$NETWORK \ - --name=kafka \ - --rm \ - bitnamilegacy/kafka:latest + -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 \ + apache/kafka:latest sleep 15 @@ -29,7 +29,7 @@ docker run -d \ --name=system \ --rm \ system:1.0-SNAPSHOT & - + docker run -d \ -e MP_MESSAGING_CONNECTOR_LIBERTY_KAFKA_BOOTSTRAP_SERVERS=$KAFKA_SERVER \ -e WLP_LOGGING_CONSOLE_LOGLEVEL=info \ @@ -38,5 +38,5 @@ docker run -d \ --name=inventory \ --rm \ inventory:1.0-SNAPSHOT & - + wait diff --git a/finish/scripts/startKafka.bat b/finish/scripts/startKafka.bat index 120ba40..78cec88 100644 --- a/finish/scripts/startKafka.bat +++ b/finish/scripts/startKafka.bat @@ -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 \ No newline at end of file + apache/kafka:latest \ No newline at end of file diff --git a/finish/scripts/startKafka.sh b/finish/scripts/startKafka.sh index 66d2d45..b7299fc 100755 --- a/finish/scripts/startKafka.sh +++ b/finish/scripts/startKafka.sh @@ -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 \ No newline at end of file diff --git a/finish/system/src/test/java/it/io/openliberty/guides/system/SystemServiceIT.java b/finish/system/src/test/java/it/io/openliberty/guides/system/SystemServiceIT.java index ae5566b..90cc392 100755 --- a/finish/system/src/test/java/it/io/openliberty/guides/system/SystemServiceIT.java +++ b/finish/system/src/test/java/it/io/openliberty/guides/system/SystemServiceIT.java @@ -35,7 +35,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; @@ -69,8 +69,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); diff --git a/scripts/testApp.sh b/scripts/testApp.sh index 5c6a45c..57bb610 100755 --- a/scripts/testApp.sh +++ b/scripts/testApp.sh @@ -7,7 +7,7 @@ set -euxo pipefail ./mvnw -ntp -pl system verify ./mvnw -ntp -pl inventory verify -docker pull -q "bitnamilegacy/kafka:latest" +docker pull -q "apache/kafka:latest" ./scripts/buildImages.sh ./scripts/startContainers.sh diff --git a/start/inventory/src/test/java/it/io/openliberty/guides/inventory/InventoryServiceIT.java b/start/inventory/src/test/java/it/io/openliberty/guides/inventory/InventoryServiceIT.java index 12dd07c..176c95a 100644 --- a/start/inventory/src/test/java/it/io/openliberty/guides/inventory/InventoryServiceIT.java +++ b/start/inventory/src/test/java/it/io/openliberty/guides/inventory/InventoryServiceIT.java @@ -11,55 +11,50 @@ // end::copyright[] package it.io.openliberty.guides.inventory; -import java.util.Collections; -import java.util.List; -import java.time.Duration; -import java.math.BigDecimal; -import java.nio.file.Paths; -import java.util.Properties; -import java.net.Socket; - -import jakarta.ws.rs.core.GenericType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.client.ClientBuilder; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.testcontainers.containers.Network; +import java.math.BigDecimal; +import java.net.Socket; +import java.nio.file.Paths; +import java.time.Duration; +import java.util.Collections; +import java.util.List; +import java.util.Properties; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.apache.kafka.clients.producer.ProducerConfig; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.apache.kafka.clients.consumer.ConsumerConfig; - -import org.testcontainers.containers.GenericContainer; -import org.testcontainers.junit.jupiter.Testcontainers; -import org.testcontainers.images.builder.ImageFromDockerfile; -import org.testcontainers.containers.wait.strategy.Wait; -import org.testcontainers.containers.output.Slf4jLogConsumer; -import org.testcontainers.kafka.ConfluentKafkaContainer; - -import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.serialization.StringSerializer; import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.Network; +import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.images.builder.ImageFromDockerfile; +import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.kafka.KafkaContainer; import io.openliberty.guides.models.SystemLoad; import io.openliberty.guides.models.SystemLoad.SystemLoadSerializer; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; @Testcontainers public class InventoryServiceIT { @@ -78,8 +73,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); @@ -207,7 +202,8 @@ public void testCpuUsage() throws InterruptedException { Response response = client.getSystems(); List systems = response.readEntity(new GenericType>() { }); - assertEquals(200, response.getStatus(), "Response should be 200"); + assertEquals(200, response.getStatus(), + "Response should be 200"); assertEquals(systems.size(), 1); for (Properties system : systems) { assertEquals(sl.hostname, system.get("hostname"), diff --git a/start/scripts/buildImages.bat b/start/scripts/buildImages.bat index ce1ed88..4f09e5e 100644 --- a/start/scripts/buildImages.bat +++ b/start/scripts/buildImages.bat @@ -1,7 +1,7 @@ @ECHO Starting Scripts @ECHO OFF -start /b docker pull bitnamilegacy/kafka:latest +start /b docker pull apache/kafka:latest start /b docker build -q -t system:1.0-SNAPSHOT system\. start /b docker build -q -t inventory:1.0-SNAPSHOT inventory\. diff --git a/start/scripts/buildImages.sh b/start/scripts/buildImages.sh index d7b3332..05c30f1 100755 --- a/start/scripts/buildImages.sh +++ b/start/scripts/buildImages.sh @@ -1,7 +1,7 @@ #!/bin/bash echo Pull kafka images -docker pull -q bitnamilegacy/kafka:latest +docker pull -q apache/kafka:latest echo Building images docker build -t system:1.0-SNAPSHOT system/. & diff --git a/start/scripts/startContainers.bat b/start/scripts/startContainers.bat index 2bd880a..3a9a60a 100644 --- a/start/scripts/startContainers.bat +++ b/start/scripts/startContainers.bat @@ -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% ^ diff --git a/start/scripts/startContainers.sh b/start/scripts/startContainers.sh index a491399..dd7ae01 100755 --- a/start/scripts/startContainers.sh +++ b/start/scripts/startContainers.sh @@ -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 \ - --hostname=kafka \ - --network=$NETWORK \ - --name=kafka \ - --rm \ - bitnamilegacy/kafka:latest + -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 \ + apache/kafka:latest sleep 15 @@ -29,7 +29,7 @@ docker run -d \ --name=system \ --rm \ system:1.0-SNAPSHOT & - + docker run -d \ -e MP_MESSAGING_CONNECTOR_LIBERTY_KAFKA_BOOTSTRAP_SERVERS=$KAFKA_SERVER \ -e WLP_LOGGING_CONSOLE_LOGLEVEL=info \ @@ -38,5 +38,5 @@ docker run -d \ --name=inventory \ --rm \ inventory:1.0-SNAPSHOT & - + wait diff --git a/start/scripts/startKafka.bat b/start/scripts/startKafka.bat index 120ba40..78cec88 100644 --- a/start/scripts/startKafka.bat +++ b/start/scripts/startKafka.bat @@ -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 \ No newline at end of file + apache/kafka:latest \ No newline at end of file diff --git a/start/scripts/startKafka.sh b/start/scripts/startKafka.sh index 66d2d45..b7299fc 100755 --- a/start/scripts/startKafka.sh +++ b/start/scripts/startKafka.sh @@ -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 \ No newline at end of file diff --git a/start/system/src/test/java/it/io/openliberty/guides/system/SystemServiceIT.java b/start/system/src/test/java/it/io/openliberty/guides/system/SystemServiceIT.java index ae5566b..90cc392 100755 --- a/start/system/src/test/java/it/io/openliberty/guides/system/SystemServiceIT.java +++ b/start/system/src/test/java/it/io/openliberty/guides/system/SystemServiceIT.java @@ -35,7 +35,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; @@ -69,8 +69,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);