Skip to content

Commit 49cd21c

Browse files
committed
use tmp dir for config
1 parent 260cbd0 commit 49cd21c

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ mongodb_exporter
1313
.DS_Store
1414

1515
docker/kerberos/cache/*
16-
docker/kerberos/conf/*
16+

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ test-cover: env ## Run tests and collect cross-package coverage inf
108108
go test -tags gssapi -race -timeout 30s -coverprofile=cover.out -covermode=atomic -coverpkg=./... ./...
109109

110110
test-cluster: env ## Starts MongoDB test cluster. Use env var TEST_MONGODB_IMAGE to set flavor and version. Example: TEST_MONGODB_IMAGE=mongo:3.6 make test-cluster
111-
touch ./docker/kerberos/cache/krb5.conf
112111
docker compose up --build -d
113112
./docker/scripts/init-psmdb-kerberos.sh
114113
./docker/scripts/init-pbm.sh

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,12 +295,12 @@ services:
295295
- KRB5_TRACE=/dev/stderr
296296
- MONGO_HOST=psmdb-kerberos
297297
- KERBEROS_HOST=kerberos
298+
- KRB5_CONFIG=/tmp/krb5.conf
298299
- MONGO_KERBEROS_USERNAME=pmm-test
299300
- MONGO_KERBEROS_PASSWORD=password1
300301
depends_on:
301302
- psmdb-kerberos
302303
volumes:
303-
- ./docker/kerberos/conf/krb5.conf:/etc/krb5.conf
304304
- ./docker/kerberos/cache:/tmp/
305305
- ./docker/scripts:/scripts
306306
ports:
@@ -321,11 +321,11 @@ services:
321321
environment:
322322
- KRB5_KTNAME=/tmp/mongodb.keytab
323323
- KRB5CCNAME=/tmp/krb5cc_0
324+
- KRB5_CONFIG=/tmp/krb5.conf
324325
- MONGO_INITDB_ROOT_USERNAME=admin
325326
- MONGO_INITDB_ROOT_PASSWORD=adminpassword
326327
- MONGODB_HOST=psmdb-kerberos
327328
volumes:
328-
- ./docker/kerberos/conf/krb5.conf:/etc/krb5.conf
329329
- ./docker/scripts:/scripts
330330
- ./docker/kerberos/cache:/tmp/
331331
command: >

docker/scripts/setup-krb5-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ mongohost=`getent hosts ${MONGO_HOST} | awk '{ print $1 }'`
44
kerberos_host=`getent hosts ${KERBEROS_HOST} | awk '{ print $1 }'`
55
gateway_ip=`ip route | grep default | awk '{print $3}'`
66

7-
cat > /etc/krb5.conf <<EOL
7+
cat > /tmp/krb5.conf <<EOL
88
[libdefaults]
99
default_realm = PERCONATEST.COM
1010
forwardable = true

0 commit comments

Comments
 (0)