Skip to content

Commit 3926ed1

Browse files
yasinlachinyyasinlachiny
committed
fix: resolve conflicts
1 parent c43185b commit 3926ed1

File tree

2 files changed

+36
-30
lines changed

2 files changed

+36
-30
lines changed

‎zk-multiple-kafka-multiple.yml

+19-16
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '2.1'
22

33
services:
44
zoo1:
5-
image: confluentinc/cp-zookeeper:7.1.1
5+
image: confluentinc/cp-zookeeper:7.3.2
66
hostname: zoo1
77
container_name: zoo1
88
ports:
@@ -13,7 +13,7 @@ services:
1313
ZOOKEEPER_SERVERS: zoo1:2888:3888;zoo2:2888:3888;zoo3:2888:3888
1414

1515
zoo2:
16-
image: confluentinc/cp-zookeeper:7.1.1
16+
image: confluentinc/cp-zookeeper:7.3.2
1717
hostname: zoo2
1818
container_name: zoo2
1919
ports:
@@ -24,7 +24,7 @@ services:
2424
ZOOKEEPER_SERVERS: zoo1:2888:3888;zoo2:2888:3888;zoo3:2888:3888
2525

2626
zoo3:
27-
image: confluentinc/cp-zookeeper:7.1.1
27+
image: confluentinc/cp-zookeeper:7.3.2
2828
hostname: zoo3
2929
container_name: zoo3
3030
ports:
@@ -37,15 +37,16 @@ services:
3737

3838

3939
kafka1:
40-
image: confluentinc/cp-kafka:7.1.1
40+
image: confluentinc/cp-kafka:7.3.2
4141
hostname: kafka1
4242
container_name: kafka1
4343
ports:
4444
- "9092:9092"
45+
- "29092:29092"
4546
environment:
46-
KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka1:19092,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP}:9092
47-
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT
48-
KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_DOCKER_INTERNAL
47+
KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka1:19092,EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9092,DOCKER://host.docker.internal:29092
48+
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,DOCKER:PLAINTEXT
49+
KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
4950
KAFKA_ZOOKEEPER_CONNECT: "zoo1:2181,zoo2:2182,zoo3:2183"
5051
KAFKA_BROKER_ID: 1
5152
KAFKA_LOG4J_LOGGERS: "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO"
@@ -57,15 +58,16 @@ services:
5758
- zoo3
5859

5960
kafka2:
60-
image: confluentinc/cp-kafka:7.1.1
61+
image: confluentinc/cp-kafka:7.3.2
6162
hostname: kafka2
6263
container_name: kafka2
6364
ports:
6465
- "9093:9093"
66+
- "29093:29093"
6567
environment:
66-
KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka2:19093,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP}:9093
67-
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT
68-
KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_DOCKER_INTERNAL
68+
KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka2:19093,EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9093,DOCKER://host.docker.internal:29093
69+
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,DOCKER:PLAINTEXT
70+
KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
6971
KAFKA_ZOOKEEPER_CONNECT: "zoo1:2181,zoo2:2182,zoo3:2183"
7072
KAFKA_BROKER_ID: 2
7173
KAFKA_LOG4J_LOGGERS: "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO"
@@ -77,15 +79,16 @@ services:
7779
- zoo3
7880

7981
kafka3:
80-
image: confluentinc/cp-kafka:7.1.1
82+
image: confluentinc/cp-kafka:7.3.2
8183
hostname: kafka3
8284
container_name: kafka3
8385
ports:
8486
- "9094:9094"
87+
- "29094:29094"
8588
environment:
86-
KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka3:19094,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP}:9094
87-
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT
88-
KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_DOCKER_INTERNAL
89+
KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka3:19094,EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9094,DOCKER://host.docker.internal:29094
90+
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,DOCKER:PLAINTEXT
91+
KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
8992
KAFKA_ZOOKEEPER_CONNECT: "zoo1:2181,zoo2:2182,zoo3:2183"
9093
KAFKA_BROKER_ID: 3
9194
KAFKA_LOG4J_LOGGERS: "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO"
@@ -94,4 +97,4 @@ services:
9497
depends_on:
9598
- zoo1
9699
- zoo2
97-
- zoo3
100+
- zoo3

‎zk-single-kafka-multiple.yml

+17-14
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '2.1'
22

33
services:
44
zoo1:
5-
image: confluentinc/cp-zookeeper:7.1.1
5+
image: confluentinc/cp-zookeeper:7.3.2
66
hostname: zoo1
77
container_name: zoo1
88
ports:
@@ -14,15 +14,16 @@ services:
1414

1515

1616
kafka1:
17-
image: confluentinc/cp-kafka:7.1.1
17+
image: confluentinc/cp-kafka:7.3.2
1818
hostname: kafka1
1919
container_name: kafka1
2020
ports:
2121
- "9092:9092"
22+
- "29092:29092"
2223
environment:
23-
KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka1:19092,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP}:9092
24-
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT
25-
KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_DOCKER_INTERNAL
24+
KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka1:19092,EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9092,DOCKER://host.docker.internal:29092
25+
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,DOCKER:PLAINTEXT
26+
KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
2627
KAFKA_ZOOKEEPER_CONNECT: "zoo1:2181"
2728
KAFKA_BROKER_ID: 1
2829
KAFKA_LOG4J_LOGGERS: "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO"
@@ -32,15 +33,16 @@ services:
3233
- zoo1
3334

3435
kafka2:
35-
image: confluentinc/cp-kafka:7.1.1
36+
image: confluentinc/cp-kafka:7.3.2
3637
hostname: kafka2
3738
container_name: kafka2
3839
ports:
3940
- "9093:9093"
41+
- "29093:29093"
4042
environment:
41-
KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka2:19093,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP}:9093
42-
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT
43-
KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_DOCKER_INTERNAL
43+
KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka2:19093,EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9093,DOCKER://host.docker.internal:29093
44+
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,DOCKER:PLAINTEXT
45+
KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
4446
KAFKA_ZOOKEEPER_CONNECT: "zoo1:2181"
4547
KAFKA_BROKER_ID: 2
4648
KAFKA_LOG4J_LOGGERS: "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO"
@@ -51,19 +53,20 @@ services:
5153

5254

5355
kafka3:
54-
image: confluentinc/cp-kafka:7.1.1
56+
image: confluentinc/cp-kafka:7.3.2
5557
hostname: kafka3
5658
container_name: kafka3
5759
ports:
5860
- "9094:9094"
61+
- "29094:29094"
5962
environment:
60-
KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka3:19094,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP}:9094
61-
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT
62-
KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_DOCKER_INTERNAL
63+
KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka3:19094,EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9094,DOCKER://host.docker.internal:29094
64+
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,DOCKER:PLAINTEXT
65+
KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
6366
KAFKA_ZOOKEEPER_CONNECT: "zoo1:2181"
6467
KAFKA_BROKER_ID: 3
6568
KAFKA_LOG4J_LOGGERS: "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO"
6669
KAFKA_AUTHORIZER_CLASS_NAME: kafka.security.authorizer.AclAuthorizer
6770
KAFKA_ALLOW_EVERYONE_IF_NO_ACL_FOUND: "true"
6871
depends_on:
69-
- zoo1
72+
- zoo1

0 commit comments

Comments
 (0)