Skip to content

Commit 5a40117

Browse files
wernerdvwernerdv
authored
Docs: Fix broken composes (#796)
1 parent ff17c7a commit 5a40117

14 files changed

+13
-34
lines changed

‎.dev/dev.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ services:
2727

2828
kafka0:
2929
image: confluentinc/cp-kafka:7.8.0
30-
user: "0:0"
3130
hostname: kafka0
3231
container_name: kafka0
3332
ports:

‎documentation/compose/auth-context.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,4 @@ services:
4242
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
4343
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
4444
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
45-
volumes:
46-
- ./scripts/update_run.sh:/tmp/update_run.sh
47-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
45+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'

‎documentation/compose/cluster-sr-auth.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ services:
2626
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
2727
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
2828
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
29-
volumes:
30-
- ./scripts/update_run.sh:/tmp/update_run.sh
31-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
29+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
3230

3331
schemaregistry1:
3432
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/e2e-tests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ services:
3030

3131
kafka0:
3232
image: confluentinc/cp-kafka:7.8.0
33-
user: "0:0"
3433
hostname: kafka0
3534
container_name: kafka0
3635
healthcheck:

‎documentation/compose/kafbat-ui.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ services:
5050
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
5151
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
5252
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
53-
volumes:
54-
- ./scripts/update_run.sh:/tmp/update_run.sh
55-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
53+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
5654

5755
kafka1:
5856
image: confluentinc/cp-kafka:7.8.0
@@ -78,9 +76,7 @@ services:
7876
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
7977
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
8078
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
81-
volumes:
82-
- ./scripts/update_run.sh:/tmp/update_run.sh
83-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
79+
CLUSTER_ID: 'zlFiTJelTOuhnklFwLWixw'
8480

8581
schemaregistry0:
8682
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/kafka-ssl-components.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,11 @@ services:
7272
#KAFKA_SSL_CLIENT_AUTH: 'required'
7373
KAFKA_SSL_CLIENT_AUTH: 'requested'
7474
KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # COMMON NAME VERIFICATION IS DISABLED SERVER-SIDE
75+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
7576
volumes:
76-
- ./scripts/update_run.sh:/tmp/update_run.sh
7777
- ./ssl/creds:/etc/kafka/secrets/creds
7878
- ./ssl/kafka.truststore.jks:/etc/kafka/secrets/kafka.truststore.jks
7979
- ./ssl/kafka.keystore.jks:/etc/kafka/secrets/kafka.keystore.jks
80-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
8180

8281
schemaregistry0:
8382
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/kafka-ssl.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ services:
5555
#KAFKA_SSL_CLIENT_AUTH: 'required'
5656
KAFKA_SSL_CLIENT_AUTH: 'requested'
5757
KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # COMMON NAME VERIFICATION IS DISABLED SERVER-SIDE
58+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
5859
volumes:
59-
- ./scripts/update_run.sh:/tmp/update_run.sh
6060
- ./ssl/creds:/etc/kafka/secrets/creds
6161
- ./ssl/kafka.truststore.jks:/etc/kafka/secrets/kafka.truststore.jks
6262
- ./ssl/kafka.keystore.jks:/etc/kafka/secrets/kafka.keystore.jks
63-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"

‎documentation/compose/ui-acl-with-zk.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,4 @@ services:
5555
KAFKA_SECURITY_PROTOCOL: 'SASL_PLAINTEXT'
5656
KAFKA_SUPER_USERS: 'User:admin'
5757
volumes:
58-
- ./scripts/update_run.sh:/tmp/update_run.sh
5958
- ./jaas:/etc/kafka/jaas

‎documentation/compose/ui-connectors-auth.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ services:
4545
KAFKA_INTER_BROKER_LISTENER_NAME: "PLAINTEXT"
4646
KAFKA_CONTROLLER_LISTENER_NAMES: "CONTROLLER"
4747
KAFKA_LOG_DIRS: "/tmp/kraft-combined-logs"
48-
volumes:
49-
- ./scripts/update_run.sh:/tmp/update_run.sh
50-
command: 'bash -c ''if [ ! -f /tmp/update_run.sh ]; then echo "ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'''
48+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
5149

5250
schemaregistry0:
5351
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/ui-jmx-secured.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ services:
4949
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
5050
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
5151
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
52+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
5253
# CHMOD 700 FOR JMXREMOTE.* FILES
5354
KAFKA_JMX_OPTS: >-
5455
-Dcom.sun.management.jmxremote
@@ -69,5 +70,3 @@ services:
6970
- ./jmx/servertruststore:/jmx/servertruststore
7071
- ./jmx/jmxremote.password:/jmx/jmxremote.password
7172
- ./jmx/jmxremote.access:/jmx/jmxremote.access
72-
- ./scripts/update_run.sh:/tmp/update_run.sh
73-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"

‎documentation/compose/ui-ldap.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ services:
5858
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
5959
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
6060
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
61-
volumes:
62-
- ./scripts/update_run.sh:/tmp/update_run.sh
63-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
61+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
6462

6563
schemaregistry0:
6664
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/ui-sasl.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ services:
4646
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
4747
KAFKA_SECURITY_PROTOCOL: 'SASL_PLAINTEXT'
4848
KAFKA_SUPER_USERS: 'User:admin,User:enzo'
49+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
4950
volumes:
50-
- ./scripts/update_run.sh:/tmp/update_run.sh
5151
- ./jaas:/etc/kafka/jaas
52-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"

‎documentation/compose/ui-serdes.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ services:
9292
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
9393
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
9494
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
95-
volumes:
96-
- ./scripts/update_run.sh:/tmp/update_run.sh
97-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
95+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
9896

9997
schemaregistry0:
10098
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/ui-with-jmx-exporter.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ services:
2525
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
2626
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
2727
KAFKA_OPTS: -javaagent:/usr/share/jmx_exporter/jmx_prometheus_javaagent.jar=11001:/usr/share/jmx_exporter/kafka-broker.yml
28+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
2829
volumes:
2930
- ./jmx-exporter:/usr/share/jmx_exporter/
30-
- ./scripts/update_run.sh:/tmp/update_run.sh
31-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /usr/share/jmx_exporter/kafka-prepare-and-run ; fi'"
31+
command: "bash -c /usr/share/jmx_exporter/kafka-prepare-and-run"
3232

3333
kafbat-ui:
3434
container_name: kafbat-ui

0 commit comments

Comments
 (0)