Skip to content

Commit d851127

Browse files
petedannemannpetedannemann
authored
chore: bitnami -> bitnamilegacy (#1402)
* chore: bitnami -> bitnamilegacy * try to fix 0.10 image * remove 0.10
1 parent af1725f commit d851127

File tree

8 files changed

+53
-132
lines changed

8 files changed

+53
-132
lines changed

‎.circleci/config.yml

Lines changed: 32 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -7,70 +7,8 @@ jobs:
77
- checkout
88
- run: golangci-lint run
99

10-
# The kafka 0.10 tests are maintained as a separate configuration because
11-
# kafka only supported plain text SASL in this version.
12-
# NOTE: Bitnami does not have suport for kafka version 0.10.1.1. Hence we use 0.10.2.1
13-
kafka-010:
14-
working_directory: &working_directory /go/src/github.com/segmentio/kafka-go
15-
docker:
16-
- image: circleci/golang
17-
- image: bitnami/zookeeper:latest
18-
ports:
19-
- 2181:2181
20-
environment:
21-
ALLOW_ANONYMOUS_LOGIN: yes
22-
- image: bitnami/kafka:0.10.2.1
23-
ports:
24-
- 9092:9092
25-
- 9093:9093
26-
environment:
27-
KAFKA_BROKER_ID: 1
28-
KAFKA_DELETE_TOPIC_ENABLE: 'true'
29-
KAFKA_ADVERTISED_HOST_NAME: 'localhost'
30-
KAFKA_ADVERTISED_PORT: '9092'
31-
KAFKA_ZOOKEEPER_CONNECT: localhost:2181
32-
KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
33-
KAFKA_MESSAGE_MAX_BYTES: '200000000'
34-
KAFKA_LISTENERS: 'PLAINTEXT://:9092,SASL_PLAINTEXT://:9093'
35-
KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://localhost:9092,SASL_PLAINTEXT://localhost:9093'
36-
KAFKA_SASL_ENABLED_MECHANISMS: 'PLAIN,SCRAM-SHA-256,SCRAM-SHA-512'
37-
KAFKA_AUTHORIZER_CLASS_NAME: 'kafka.security.auth.SimpleAclAuthorizer'
38-
KAFKA_ALLOW_EVERYONE_IF_NO_ACL_FOUND: 'true'
39-
KAFKA_OPTS: "-Djava.security.auth.login.config=/opt/bitnami/kafka/config/kafka_server_jaas.conf"
40-
ALLOW_PLAINTEXT_LISTENER: yes
41-
entrypoint:
42-
- "/bin/bash"
43-
- "-c"
44-
- echo -e 'KafkaServer {\norg.apache.kafka.common.security.scram.ScramLoginModule required\n username="adminscram"\n password="admin-secret";\n org.apache.kafka.common.security.plain.PlainLoginModule required\n username="adminplain"\n password="admin-secret"\n user_adminplain="admin-secret";\n };' > /opt/bitnami/kafka/config/kafka_server_jaas.conf; /opt/bitnami/kafka/bin/kafka-configs.sh --zookeeper localhost:2181 --alter --add-config 'SCRAM-SHA-256=[password=admin-secret-256],SCRAM-SHA-512=[password=admin-secret-512]' --entity-type users --entity-name adminscram; exec /app-entrypoint.sh /start-kafka.sh
45-
46-
steps: &steps
47-
- checkout
48-
- restore_cache:
49-
key: kafka-go-mod-{{ checksum "go.sum" }}-1
50-
- run:
51-
name: Download dependencies
52-
command: go mod download
53-
- save_cache:
54-
key: kafka-go-mod-{{ checksum "go.sum" }}-1
55-
paths:
56-
- /go/pkg/mod
57-
- run:
58-
name: Wait for kafka
59-
command: ./scripts/wait-for-kafka.sh
60-
- run:
61-
name: Test kafka-go
62-
command: go test -race -cover ./...
63-
- run:
64-
name: Test kafka-go unsafe
65-
command: go test -tags=unsafe -race -cover ./...
66-
- run:
67-
name: Test kafka-go/sasl/aws_msk_iam
68-
working_directory: ./sasl/aws_msk_iam
69-
command: go test -race -cover ./...
70-
71-
# NOTE: Bitnami does not have suport for kafka version 2.7.1. Hence we use 2.7.0
7210
kafka-270:
73-
working_directory: *working_directory
11+
working_directory: &working_directory /go/src/github.com/segmentio/kafka-go
7412
environment:
7513
KAFKA_VERSION: "2.7.0"
7614

@@ -86,12 +24,12 @@ jobs:
8624
KAFKA_SKIP_NETTEST: "1"
8725
docker:
8826
- image: circleci/golang
89-
- image: bitnami/zookeeper:latest
27+
- image: bitnamilegacy/zookeeper:latest
9028
ports:
9129
- 2181:2181
9230
environment:
9331
ALLOW_ANONYMOUS_LOGIN: yes
94-
- image: bitnami/kafka:2.7.0
32+
- image: bitnamilegacy/kafka:2.7.0
9533
ports:
9634
- 9092:9092
9735
- 9093:9093
@@ -114,7 +52,30 @@ jobs:
11452
- "/bin/bash"
11553
- "-c"
11654
- echo -e 'KafkaServer {\norg.apache.kafka.common.security.scram.ScramLoginModule required\n username="adminscram"\n password="admin-secret";\n org.apache.kafka.common.security.plain.PlainLoginModule required\n username="adminplain"\n password="admin-secret"\n user_adminplain="admin-secret";\n };' > /opt/bitnami/kafka/config/kafka_jaas.conf; /opt/bitnami/kafka/bin/kafka-configs.sh --zookeeper localhost:2181 --alter --add-config "SCRAM-SHA-256=[password=admin-secret-256],SCRAM-SHA-512=[password=admin-secret-512]" --entity-type users --entity-name adminscram; exec /entrypoint.sh /run.sh
117-
steps: *steps
55+
steps: &steps
56+
- checkout
57+
- restore_cache:
58+
key: kafka-go-mod-{{ checksum "go.sum" }}-1
59+
- run:
60+
name: Download dependencies
61+
command: go mod download
62+
- save_cache:
63+
key: kafka-go-mod-{{ checksum "go.sum" }}-1
64+
paths:
65+
- /go/pkg/mod
66+
- run:
67+
name: Wait for kafka
68+
command: ./scripts/wait-for-kafka.sh
69+
- run:
70+
name: Test kafka-go
71+
command: go test -race -cover ./...
72+
- run:
73+
name: Test kafka-go unsafe
74+
command: go test -tags=unsafe -race -cover ./...
75+
- run:
76+
name: Test kafka-go/sasl/aws_msk_iam
77+
working_directory: ./sasl/aws_msk_iam
78+
command: go test -race -cover ./...
11879

11980
kafka-281:
12081
working_directory: *working_directory
@@ -133,12 +94,12 @@ jobs:
13394
KAFKA_SKIP_NETTEST: "1"
13495
docker:
13596
- image: circleci/golang
136-
- image: bitnami/zookeeper:latest
97+
- image: bitnamilegacy/zookeeper:latest
13798
ports:
13899
- 2181:2181
139100
environment:
140101
ALLOW_ANONYMOUS_LOGIN: yes
141-
- image: bitnami/kafka:2.8.1
102+
- image: bitnamilegacy/kafka:2.8.1
142103
ports:
143104
- 9092:9092
144105
- 9093:9093
@@ -163,12 +124,12 @@ jobs:
163124
KAFKA_SKIP_NETTEST: "1"
164125
docker:
165126
- image: circleci/golang
166-
- image: bitnami/zookeeper:latest
127+
- image: bitnamilegacy/zookeeper:latest
167128
ports:
168129
- 2181:2181
169130
environment:
170131
ALLOW_ANONYMOUS_LOGIN: yes
171-
- image: bitnami/kafka:3.7.0
132+
- image: bitnamilegacy/kafka:3.7.0
172133
ports:
173134
- 9092:9092
174135
- 9093:9093
@@ -198,7 +159,7 @@ jobs:
198159
# KAFKA_SKIP_NETTEST: "1"
199160
# docker:
200161
# - image: circleci/golang
201-
# - image: bitnami/kafka:4.0.0
162+
# - image: bitnamilegacy/kafka:4.0.0
202163
# ports:
203164
# - 9092:9092
204165
# - 9093:9093
@@ -235,7 +196,6 @@ workflows:
235196
run:
236197
jobs:
237198
- lint
238-
- kafka-010
239199
- kafka-270
240200
- kafka-281
241201
- kafka-370

‎docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ services:
44
zookeeper:
55
container_name: zookeeper
66
hostname: zookeeper
7-
image: bitnami/zookeeper:latest
7+
image: bitnamilegacy/zookeeper:latest
88
ports:
99
- 2181:2181
1010
environment:
1111
ALLOW_ANONYMOUS_LOGIN: yes
1212
kafka:
1313
container_name: kafka
14-
image: bitnami/kafka:3.7.0
14+
image: bitnamilegacy/kafka:3.7.0
1515
restart: on-failure:3
1616
links:
1717
- zookeeper

‎docker_compose_versions/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This document outlines how to create a docker-compose file for a specific Bitnam
55

66
## Steps to create docker-compose
77

8-
- Refer to [docker-hub Bitnami Kafka tags](https://hub.docker.com/r/bitnami/kafka/tags) and sort by NEWEST to locate the image preferred, for example: `2.7.0`
8+
- Refer to [docker-hub Bitnami Kafka tags](https://hub.docker.com/r/bitnamilegacy/kafka/tags) and sort by NEWEST to locate the image preferred, for example: `2.7.0`
99
- There is documentation in the (main branch)[https://github.com/bitnami/containers/blob/main/bitnami/kafka/README.md] for environment config setup information. Refer to the `Notable Changes` section.
1010
- Sometimes there is a need to understand how the set up is being done. To locate the appropriate Kafka release in the repo [bitnami/containers](https://github.com/bitnami/containers), go through the [kafka commit history](https://github.com/bitnami/containers/commits/main/bitnami/kafka).
1111
- Once a commit is located, Refer to README.md, Dockerfile, entrypoint and various init scripts to understand the environment variables to config server.properties mapping conventions. Alternatively, you can spin up the required Kafka image and refer the mapping inside the container.
@@ -112,41 +112,41 @@ For user reference, please find the some of the older kafka versions commits fro
112112

113113

114114
### Kafka v010: docker-compose reference: `kafka-go/docker_compose_versions/docker-compose-010.yml`
115-
- [tag](https://hub.docker.com/r/bitnami/kafka/tags?page=1&ordering=last_updated&name=0.10.2.1)
115+
- [tag](https://hub.docker.com/r/bitnamilegacy/kafka/tags?page=1&ordering=last_updated&name=0.10.2.1)
116116
- [kafka commit](https://github.com/bitnami/containers/tree/c4240f0525916a418245c7ef46d9534a7a212c92/bitnami/kafka)
117117

118118

119119
### Kafka v011: docker-compose reference: `kafka-go/docker_compose_versions/docker-compose-011.yml`
120-
- [tag](https://hub.docker.com/r/bitnami/kafka/tags?page=1&ordering=last_updated&name=0.11.0)
120+
- [tag](https://hub.docker.com/r/bitnamilegacy/kafka/tags?page=1&ordering=last_updated&name=0.11.0)
121121
- [kafka commit](https://github.com/bitnami/containers/tree/7724adf655e4ca9aac69d606d41ad329ef31eeca/bitnami/kafka)
122122

123123

124124
### Kafka v101: docker-compose reference: N/A
125-
- [tag](https://hub.docker.com/r/bitnami/kafka/tags?page=1&ordering=last_updated&name=1.0.1)
125+
- [tag](https://hub.docker.com/r/bitnamilegacy/kafka/tags?page=1&ordering=last_updated&name=1.0.1)
126126
- [kafka commit](https://github.com/bitnami/containers/tree/44cc8f4c43ead6edebd3758c8df878f4f9da82c2/bitnami/kafka)
127127

128128

129129
### Kafka v111: docker-compose reference: N/A
130-
- [tag](https://hub.docker.com/r/bitnami/kafka/tags?page=1&ordering=last_updated&name=1.1.1)
130+
- [tag](https://hub.docker.com/r/bitnamilegacy/kafka/tags?page=1&ordering=last_updated&name=1.1.1)
131131
- [kafka commit](https://github.com/bitnami/containers/tree/cb593dc98c2eb7a39f2792641e741d395dbe50e7/bitnami/kafka)
132132

133133

134134
### Kafka v201: docker-compose reference: N/A
135-
- [tag](https://hub.docker.com/r/bitnami/kafka/tags?page=1&ordering=last_updated&name=2.0.1)
135+
- [tag](https://hub.docker.com/r/bitnamilegacy/kafka/tags?page=1&ordering=last_updated&name=2.0.1)
136136
- [kafka commit](https://github.com/bitnami/containers/tree/9ff8763df265c87c8b59f8d7ff0cf69299d636c9/bitnami/kafka)
137137

138138

139139
### Kafka v211: docker-compose reference: N/A
140-
- [tag](https://hub.docker.com/r/bitnami/kafka/tags?page=1&ordering=last_updated&name=2.1.1)
140+
- [tag](https://hub.docker.com/r/bitnamilegacy/kafka/tags?page=1&ordering=last_updated&name=2.1.1)
141141
- [kafka commit](https://github.com/bitnami/containers/tree/d3a9d40afc2b7e7de53486538a63084c1a565d43/bitnami/kafka)
142142

143143

144144
### Kafka v221: docker-compose reference: N/A
145-
- [tag](https://hub.docker.com/r/bitnami/kafka/tags?page=1&ordering=last_updated&name=2.2.1)
145+
- [tag](https://hub.docker.com/r/bitnamilegacy/kafka/tags?page=1&ordering=last_updated&name=2.2.1)
146146
- [kafka commit](https://github.com/bitnami/containers/tree/f132ef830d1ba9b78392ec4619174b4640c276c9/bitnami/kafka)
147147

148148

149149
### Kafka v231: docker-compose reference: `kafka-go/docker_compose_versions/docker-compose-231.yml`
150-
- [tag](https://hub.docker.com/r/bitnami/kafka/tags?page=1&ordering=last_updated&name=2.3.1)
150+
- [tag](https://hub.docker.com/r/bitnamilegacy/kafka/tags?page=1&ordering=last_updated&name=2.3.1)
151151
- [kafka commit](https://github.com/bitnami/containers/tree/ae572036b5281456b0086345fec0bdb74f7cf3a3/bitnami/kafka)
152152

‎docker_compose_versions/docker-compose-010.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎docker_compose_versions/docker-compose-270.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# See https://hub.docker.com/r/bitnami/kafka/tags for the complete list.
1+
# See https://hub.docker.com/r/bitnamilegacy/kafka/tags for the complete list.
22
version: '3'
33
services:
44
zookeeper:
55
container_name: zookeeper
66
hostname: zookeeper
7-
image: bitnami/zookeeper:latest
7+
image: bitnamilegacy/zookeeper:latest
88
ports:
99
- 2181:2181
1010
environment:
1111
ALLOW_ANONYMOUS_LOGIN: yes
1212
kafka:
1313
container_name: kafka
14-
image: bitnami/kafka:2.7.0
14+
image: bitnamilegacy/kafka:2.7.0
1515
restart: on-failure:3
1616
links:
1717
- zookeeper

‎docker_compose_versions/docker-compose-370.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# See https://hub.docker.com/r/bitnami/kafka/tags for the complete list.
1+
# See https://hub.docker.com/r/bitnamilegacy/kafka/tags for the complete list.
22
version: '3'
33
services:
44
zookeeper:
55
container_name: zookeeper
66
hostname: zookeeper
7-
image: bitnami/zookeeper:latest
7+
image: bitnamilegacy/zookeeper:latest
88
ports:
99
- 2181:2181
1010
environment:
1111
ALLOW_ANONYMOUS_LOGIN: yes
1212
kafka:
1313
container_name: kafka
14-
image: bitnami/kafka:3.7.0
14+
image: bitnamilegacy/kafka:3.7.0
1515
restart: on-failure:3
1616
links:
1717
- zookeeper

‎docker_compose_versions/docker-compose-400.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# See https://hub.docker.com/r/bitnami/kafka/tags for the complete list.
1+
# See https://hub.docker.com/r/bitnamilegacy/kafka/tags for the complete list.
22
version: '3'
33
services:
44
kafka:
55
container_name: kafka
6-
image: bitnami/kafka:4.0.0
6+
image: bitnamilegacy/kafka:4.0.0
77
restart: on-failure:3
88
ports:
99
- 9092:9092

‎examples/docker-compose.yaml

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

44
zookeeper:
55
hostname: zookeeper
6-
image: bitnami/zookeeper:latest
6+
image: bitnamilegacy/zookeeper:latest
77
restart: always
88
expose:
99
- "2181"
@@ -14,7 +14,7 @@ services:
1414

1515
kafka:
1616
hostname: kafka
17-
image: bitnami/kafka:2.7.0
17+
image: bitnamilegacy/kafka:2.7.0
1818
restart: always
1919
env_file:
2020
- kafka/kafka-variables.env

0 commit comments

Comments
 (0)