Skip to content

Commit b2e34d2

Browse files
vdesabouvdesabou
committed
🐳 Allow to override all CP images TAG #6395 
1 parent d809c7f commit b2e34d2

File tree

27 files changed

+166
-83
lines changed

27 files changed

+166
-83
lines changed

‎ccloud/connect-centralized-license/docker-compose-connect-onprem-to-cloud.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
services:
33

44
zookeeper:
5-
image: ${CP_ZOOKEEPER_IMAGE}:${TAG}
5+
image: ${CP_ZOOKEEPER_IMAGE}:${CP_ZOOKEEPER_TAG}
66
hostname: zookeeper
77
container_name: zookeeper
88
environment:
@@ -12,7 +12,7 @@ services:
1212
KAFKA_OPTS: -Dzookeeper.4lw.commands.whitelist=*
1313

1414
broker:
15-
image: ${CP_KAFKA_IMAGE}:${TAG}
15+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
1616
hostname: broker
1717
container_name: broker
1818
depends_on:
@@ -36,7 +36,7 @@ services:
3636
KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
3737

3838
schema-registry:
39-
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${TAG}
39+
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${CP_SCHEMA_REGISTRY_TAG}
4040
hostname: schema-registry
4141
container_name: schema-registry
4242
ports:

‎ccloud/environment/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ services:
6969
CONNECT_LOG4J_APPENDER_STDOUT_LAYOUT_CONVERSIONPATTERN: "[%d] %p %X{connector.context}%m (%c:%L)%n"
7070

7171
control-center:
72-
image: ${CP_CONTROL_CENTER_IMAGE}:${TAG}
72+
image: ${CP_CONTROL_CENTER_IMAGE}:${CP_CONTROL_CENTER_TAG}
7373
hostname: control-center
7474
container_name: control-center
7575
depends_on:
@@ -142,7 +142,7 @@ services:
142142

143143
# 75147
144144
# schema-registry:
145-
# image: ${CP_SCHEMA_REGISTRY_IMAGE}:${TAG}
145+
# image: ${CP_SCHEMA_REGISTRY_IMAGE}:${CP_SCHEMA_REGISTRY_TAG}
146146
# hostname: schema-registry
147147
# container_name: schema-registry
148148
# ports:

‎ccloud/migrate-schemas-to-confluent-cloud/docker-compose-executable-onprem-to-cloud.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
services:
33

44
zookeeper:
5-
image: ${CP_ZOOKEEPER_IMAGE}:${TAG}
5+
image: ${CP_ZOOKEEPER_IMAGE}:${CP_ZOOKEEPER_TAG}
66
hostname: zookeeper
77
container_name: zookeeper
88
environment:
@@ -12,7 +12,7 @@ services:
1212
KAFKA_OPTS: -Dzookeeper.4lw.commands.whitelist=*
1313

1414
broker:
15-
image: ${CP_KAFKA_IMAGE}:${TAG}
15+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
1616
hostname: broker
1717
container_name: broker
1818
depends_on:
@@ -36,7 +36,7 @@ services:
3636
KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
3737

3838
schema-registry:
39-
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${TAG}
39+
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${CP_SCHEMA_REGISTRY_TAG}
4040
hostname: schema-registry
4141
container_name: schema-registry
4242
ports:

‎ccloud/mirrormaker2/docker-compose.plaintext.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
services:
33

44
zookeeper:
5-
image: ${CP_ZOOKEEPER_IMAGE}:${TAG}
5+
image: ${CP_ZOOKEEPER_IMAGE}:${CP_ZOOKEEPER_TAG}
66
hostname: zookeeper
77
container_name: zookeeper
88
environment:
@@ -12,7 +12,7 @@ services:
1212
KAFKA_OPTS: -Dzookeeper.4lw.commands.whitelist=*
1313

1414
broker1:
15-
image: ${CP_KAFKA_IMAGE}:${TAG}
15+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
1616
hostname: broker1
1717
container_name: broker1
1818
depends_on:
@@ -29,7 +29,7 @@ services:
2929

3030

3131
broker2:
32-
image: ${CP_KAFKA_IMAGE}:${TAG}
32+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
3333
hostname: broker2
3434
container_name: broker2
3535
depends_on:
@@ -46,7 +46,7 @@ services:
4646

4747

4848
broker3:
49-
image: ${CP_KAFKA_IMAGE}:${TAG}
49+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
5050
hostname: broker3
5151
container_name: broker3
5252
depends_on:
@@ -62,7 +62,7 @@ services:
6262
KAFKA_MESSAGE_MAX_BYTES: 10048588
6363

6464
schema-registry:
65-
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${TAG}
65+
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${CP_SCHEMA_REGISTRY_TAG}
6666
hostname: schema-registry
6767
container_name: schema-registry
6868
ports:

‎ccloud/replicator/docker-compose-connect-onprem-to-cloud-with-sr-basic-auth.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
services:
33

44
zookeeper:
5-
image: ${CP_ZOOKEEPER_IMAGE}:${TAG}
5+
image: ${CP_ZOOKEEPER_IMAGE}:${CP_ZOOKEEPER_TAG}
66
hostname: zookeeper
77
container_name: zookeeper
88
environment:
@@ -12,7 +12,7 @@ services:
1212
KAFKA_OPTS: -Dzookeeper.4lw.commands.whitelist=*
1313

1414
broker:
15-
image: ${CP_KAFKA_IMAGE}:${TAG}
15+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
1616
hostname: broker
1717
container_name: broker
1818
depends_on:
@@ -36,7 +36,7 @@ services:
3636
KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
3737

3838
schema-registry:
39-
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${TAG}
39+
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${CP_SCHEMA_REGISTRY_TAG}
4040
hostname: schema-registry
4141
container_name: schema-registry
4242
ports:

‎ccloud/replicator/docker-compose-connect-onprem-to-cloud.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
services:
33

44
zookeeper:
5-
image: ${CP_ZOOKEEPER_IMAGE}:${TAG}
5+
image: ${CP_ZOOKEEPER_IMAGE}:${CP_ZOOKEEPER_TAG}
66
hostname: zookeeper
77
container_name: zookeeper
88
environment:
@@ -12,7 +12,7 @@ services:
1212
KAFKA_OPTS: -Dzookeeper.4lw.commands.whitelist=*
1313

1414
broker:
15-
image: ${CP_KAFKA_IMAGE}:${TAG}
15+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
1616
hostname: broker
1717
container_name: broker
1818
depends_on:
@@ -36,7 +36,7 @@ services:
3636
KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
3737

3838
schema-registry:
39-
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${TAG}
39+
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${CP_SCHEMA_REGISTRY_TAG}
4040
hostname: schema-registry
4141
container_name: schema-registry
4242
ports:

‎ccloud/replicator/docker-compose-executable-onprem-to-cloud-avro.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
services:
33

44
zookeeper:
5-
image: ${CP_ZOOKEEPER_IMAGE}:${TAG}
5+
image: ${CP_ZOOKEEPER_IMAGE}:${CP_ZOOKEEPER_TAG}
66
hostname: zookeeper
77
container_name: zookeeper
88
environment:
@@ -12,7 +12,7 @@ services:
1212
KAFKA_OPTS: -Dzookeeper.4lw.commands.whitelist=*
1313

1414
broker:
15-
image: ${CP_KAFKA_IMAGE}:${TAG}
15+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
1616
hostname: broker
1717
container_name: broker
1818
depends_on:
@@ -36,7 +36,7 @@ services:
3636
KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
3737

3838
schema-registry:
39-
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${TAG}
39+
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${CP_SCHEMA_REGISTRY_TAG}
4040
hostname: schema-registry
4141
container_name: schema-registry
4242
ports:

‎ccloud/replicator/docker-compose-executable-onprem-to-cloud.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
services:
33

44
zookeeper:
5-
image: ${CP_ZOOKEEPER_IMAGE}:${TAG}
5+
image: ${CP_ZOOKEEPER_IMAGE}:${CP_ZOOKEEPER_TAG}
66
hostname: zookeeper
77
container_name: zookeeper
88
environment:
@@ -12,7 +12,7 @@ services:
1212
KAFKA_OPTS: -Dzookeeper.4lw.commands.whitelist=*
1313

1414
broker:
15-
image: ${CP_KAFKA_IMAGE}:${TAG}
15+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
1616
hostname: broker
1717
container_name: broker
1818
depends_on:
@@ -36,7 +36,7 @@ services:
3636
KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
3737

3838
schema-registry:
39-
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${TAG}
39+
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${CP_SCHEMA_REGISTRY_TAG}
4040
hostname: schema-registry
4141
container_name: schema-registry
4242
ports:

‎ccloud/rest-proxy-security-plugin/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
services:
33

44
restproxy:
5-
image: ${CP_REST_PROXY_IMAGE}:${TAG}
5+
image: ${CP_REST_PROXY_IMAGE}:${CP_REST_PROXY_TAG}
66
restart: always
77
hostname: restproxy
88
container_name: restproxy

‎ccloud/schema-registry-security-plugin/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
services:
33

44
schema-registry:
5-
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${TAG}
5+
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${CP_SCHEMA_REGISTRY_TAG}
66
hostname: schema-registry
77
container_name: schema-registry
88
ports:

‎environment/kerberos/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ services:
9292
principal=\"admin/for-kafka@TEST.CONFLUENT.IO\";"
9393

9494
broker2:
95-
image: ${CP_KAFKA_IMAGE}:${TAG}
95+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
9696
hostname: broker2.kerberos-demo.local
9797
container_name: broker2
9898
depends_on:
@@ -151,7 +151,7 @@ services:
151151
CONFLUENT_METRICS_ENABLE: 'true'
152152

153153
broker3:
154-
image: ${CP_KAFKA_IMAGE}:${TAG}
154+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
155155
hostname: broker3.kerberos-demo.local
156156
container_name: broker3
157157
depends_on:

‎environment/kraft-external-plaintext/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
- zookeeper
77

88
controller:
9-
image: ${CP_KAFKA_IMAGE}:${TAG}
9+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
1010
hostname: controller
1111
container_name: controller
1212
restart: always

‎environment/kraft-plaintext/docker-compose.controller.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525

2626

2727
controller:
28-
image: ${CP_KAFKA_IMAGE}:${TAG}
28+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
2929
hostname: controller
3030
container_name: controller
3131
ports:

‎environment/mdc-plaintext/docker-compose.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@ services:
88
####
99

1010
zookeeper-europe:
11-
image: ${CP_ZOOKEEPER_IMAGE}:${TAG}
11+
image: ${CP_ZOOKEEPER_IMAGE}:${CP_ZOOKEEPER_TAG}
1212
hostname: zookeeper-europe
1313
container_name: zookeeper-europe
1414
environment:
1515
ZOOKEEPER_CLIENT_PORT: 2181
1616
ZOOKEEPER_TICK_TIME: 2000
1717

1818
zookeeper-us:
19-
image: ${CP_ZOOKEEPER_IMAGE}:${TAG}
19+
image: ${CP_ZOOKEEPER_IMAGE}:${CP_ZOOKEEPER_TAG}
2020
hostname: zookeeper-us
2121
container_name: zookeeper-us
2222
environment:
2323
ZOOKEEPER_CLIENT_PORT: 2181
2424
ZOOKEEPER_TICK_TIME: 2000
2525

2626
zookeeper-metrics:
27-
image: ${CP_ZOOKEEPER_IMAGE}:${TAG}
27+
image: ${CP_ZOOKEEPER_IMAGE}:${CP_ZOOKEEPER_TAG}
2828
hostname: zookeeper-metrics
2929
container_name: zookeeper-metrics
3030
environment:
3131
ZOOKEEPER_CLIENT_PORT: 2181
3232
ZOOKEEPER_TICK_TIME: 2000
3333

3434
broker-europe:
35-
image: ${CP_KAFKA_IMAGE}:${TAG}
35+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
3636
hostname: broker-europe
3737
container_name: broker-europe
3838
depends_on:
@@ -60,7 +60,7 @@ services:
6060
KAFKA_CONFLUENT_SCHEMA_REGISTRY_URL: http://schema-registry-europe:8081
6161

6262
broker-us:
63-
image: ${CP_KAFKA_IMAGE}:${TAG}
63+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
6464
hostname: broker-us
6565
container_name: broker-us
6666
depends_on:
@@ -88,7 +88,7 @@ services:
8888
KAFKA_CONFLUENT_SCHEMA_REGISTRY_URL: http://schema-registry-us:8081
8989

9090
broker-metrics:
91-
image: ${CP_KAFKA_IMAGE}:${TAG}
91+
image: ${CP_KAFKA_IMAGE}:${CP_KAFKA_TAG}
9292
hostname: broker-metrics
9393
container_name: broker-metrics
9494
depends_on:
@@ -199,7 +199,7 @@ services:
199199
- ../../confluent-hub:/usr/share/confluent-hub-components
200200

201201
schema-registry-europe:
202-
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${TAG}
202+
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${CP_SCHEMA_REGISTRY_TAG}
203203
hostname: schema-registry-europe
204204
container_name: schema-registry-europe
205205
restart: always
@@ -213,7 +213,7 @@ services:
213213
SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: broker-europe:9092
214214

215215
schema-registry-us:
216-
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${TAG}
216+
image: ${CP_SCHEMA_REGISTRY_IMAGE}:${CP_SCHEMA_REGISTRY_TAG}
217217
hostname: schema-registry-us
218218
container_name: schema-registry-us
219219
restart: always
@@ -227,7 +227,7 @@ services:
227227
SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: broker-us:9092
228228

229229
control-center:
230-
image: ${CP_CONTROL_CENTER_IMAGE}:${TAG}
230+
image: ${CP_CONTROL_CENTER_IMAGE}:${CP_CONTROL_CENTER_TAG}
231231
hostname: control-center
232232
container_name: control-center
233233
depends_on:

0 commit comments

Comments
 (0)