Skip to content

Commit 5435cdd

Browse files
committed
fixup
Signed-off-by: Paolo Insogna <paolo@cowtech.it>
1 parent bb07f32 commit 5435cdd

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ jobs:
4242
- name: Install dependencies
4343
run: pnpm install --frozen-lockfile
4444
- name: Start Kafka (${{ matrix.confluent-kafka-version }}) Cluster
45-
run: |
46-
id && mkdir -p tmp/kerberos && chown -R 1000:1000 tmp/kerberos
47-
docker compose up --build --force-recreate -d --wait || (ls -l tmp && ls -l tmp/kerberos && docker compose logs && exit 1)
45+
run: docker compose up --build --force-recreate -d --wait || (ls -l tmp && ls -l tmp/kerberos && docker compose logs && exit 1)
4846
env:
4947
KAFKA_VERSION: ${{ matrix.confluent-kafka-version }}
5048
- name: Run Tests

docker-compose.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
services:
22
kdc:
3-
image: plt-kafka-kdc:latest
4-
pull_policy: never
5-
build:
6-
context: ./docker/kerberos
3+
image: ubuntu:latest
74
container_name: kdc
85
ports:
96
- '8000:88/tcp'
@@ -13,7 +10,7 @@ services:
1310
- './docker/kerberos/krb5-kdc.conf:/etc/krb5.conf:ro'
1411
- './docker/kerberos/kdc.conf:/var/lib/krb5kdc/kdc.conf:ro'
1512
- './docker/kerberos/init.sh:/init.sh:ro'
16-
- './tmp/kerberos:/data'
13+
- 'kerberos:/data'
1714
entrypoint: ['/bin/sh', '/init.sh']
1815
healthcheck:
1916
test: ['CMD', 'kadmin.local', '-q', 'list_principals']
@@ -106,7 +103,7 @@ services:
106103
volumes:
107104
- "./docker/sasl/jaas-kerberos.conf:/etc/kafka/jaas.conf:ro"
108105
- "./docker/kerberos/krb5-broker.conf:/etc/krb5.conf:ro"
109-
- "./tmp/kerberos/broker.keytab:/etc/kafka/broker.keytab:ro"
106+
- 'kerberos:/data'
110107
depends_on:
111108
kdc:
112109
condition: service_healthy
@@ -173,3 +170,6 @@ services:
173170
# Broker specific general and port options
174171
KAFKA_NODE_ID: "3"
175172
KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://localhost:9013,DOCKER://broker-cluster-3:19092"
173+
174+
volumes:
175+
kerberos:

docker/kerberos/Dockerfile

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

docker/kerberos/init.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ set -e
33

44
# Setup KDC if needed
55
if [ ! -f /var/lib/krb5kdc/principal ]; then
6+
chown -R ubuntu:ubuntu /data
7+
chmod -R 755 /data
8+
9+
echo "Installing Kerberos packages ..."
10+
apt-get update && apt-get install -y krb5-kdc krb5-admin-server && rm -rf /var/lib/apt/lists/*
11+
612
echo "Setting up KDC ..."
713
kdb5_util create -s -P password
814

@@ -15,9 +21,10 @@ if [ ! -f /var/lib/krb5kdc/principal ]; then
1521
kadmin.local -q "addprinc -randkey admin-keytab@EXAMPLE.COM" # Client with keytab
1622
kadmin.local -q "addprinc -pw admin admin-password@EXAMPLE.COM" # Client with password
1723

18-
# Genera keytab
24+
# Generate keytabs
1925
kadmin.local -q "ktadd -k /data/broker.keytab broker/broker-sasl-kerberos@EXAMPLE.COM"
2026
kadmin.local -q "ktadd -k /data/admin.keytab admin-keytab@EXAMPLE.COM"
27+
chown -R ubuntu:ubuntu /data
2128
fi
2229

2330
krb5kdc

0 commit comments

Comments
 (0)