Skip to content

Commit e126de1

Browse files
committed
Docker tests: don't use DOCKER_ prefixed env vars since they (may) have external meaning
.. to docker-compose
1 parent 68de153 commit e126de1

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-19
lines changed

tests/docker/.env

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/usr/bin/env bash
22

3-
export DOCKER_SOURCE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
4-
export DOCKER_CONTEXT=$DOCKER_SOURCE/docker-compose.yaml
5-
export DOCKER_BIN=$DOCKER_SOURCE/bin
6-
export DOCKER_CONF=$DOCKER_SOURCE/conf
7-
export TLS=$DOCKER_CONF/tls
3+
export PY_DOCKER_SOURCE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
4+
export PY_DOCKER_COMPOSE_FILE=$PY_DOCKER_SOURCE/docker-compose.yaml
5+
export PY_DOCKER_CONTEXT="python-test-$(uuidgen)"
6+
export PY_DOCKER_BIN=$PY_DOCKER_SOURCE/bin
7+
export PY_DOCKER_CONF=$PY_DOCKER_SOURCE/conf
8+
export TLS=$PY_DOCKER_CONF/tls
89

910
export MY_BOOTSTRAP_SERVER_ENV=localhost:29092
1011
export MY_SCHEMA_REGISTRY_URL_ENV=http://$(hostname):8081

tests/docker/bin/certify.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
set -eu
44

5-
DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
5+
PY_DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
66
export PASS="abcdefgh"
77

8-
source ${DOCKER_BIN}/../.env
8+
source ${PY_DOCKER_BIN}/../.env
99

1010
mkdir -p ${TLS}
1111

@@ -17,11 +17,11 @@ fi
1717
HOST=$(hostname -f)
1818

1919
echo "Creating ca-cert..."
20-
${DOCKER_BIN}/gen-ssl-certs.sh ca ${TLS}/ca-cert ${HOST}
20+
${PY_DOCKER_BIN}/gen-ssl-certs.sh ca ${TLS}/ca-cert ${HOST}
2121
echo "Creating server cert..."
22-
${DOCKER_BIN}/gen-ssl-certs.sh -k server ${TLS}/ca-cert ${TLS}/ ${HOST} ${HOST}
22+
${PY_DOCKER_BIN}/gen-ssl-certs.sh -k server ${TLS}/ca-cert ${TLS}/ ${HOST} ${HOST}
2323
echo "Creating client cert..."
24-
${DOCKER_BIN}/gen-ssl-certs.sh client ${TLS}/ca-cert ${TLS}/ ${HOST} ${HOST}
24+
${PY_DOCKER_BIN}/gen-ssl-certs.sh client ${TLS}/ca-cert ${TLS}/ ${HOST} ${HOST}
2525

2626
echo "Creating key ..."
2727
openssl rsa -in ${TLS}/client.key -out ${TLS}/client.key -passin pass:${PASS}

tests/docker/bin/cluster_down.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
set -eu
44

5-
DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
6-
source ${DOCKER_BIN}/../.env
5+
PY_DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
6+
source ${PY_DOCKER_BIN}/../.env
77

88
echo "Destroying cluster.."
9-
docker-compose -f ${DOCKER_CONTEXT} down -v --remove-orphans
9+
docker-compose -f $PY_DOCKER_COMPOSE_FILE down -v --remove-orphans

tests/docker/bin/cluster_up.sh

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
set -eu
44

5-
DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
6-
source ${DOCKER_BIN}/../.env
5+
PY_DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
6+
source ${PY_DOCKER_BIN}/../.env
77

88
# Wait for http service listener to come up and start serving
99
# $1 http service name
@@ -27,20 +27,21 @@ await_http() {
2727
}
2828

2929
echo "Configuring Environment..."
30-
source ${DOCKER_SOURCE}/.env
30+
source ${PY_DOCKER_SOURCE}/.env
3131

3232
echo "Generating SSL certs..."
33-
${DOCKER_BIN}/certify.sh
33+
${PY_DOCKER_BIN}/certify.sh
3434

3535
echo "Deploying cluster..."
36-
docker-compose -f ${DOCKER_CONTEXT} up -d
36+
docker-compose -f $PY_DOCKER_COMPOSE_FILE up -d
3737

3838
echo "Setting throttle for throttle test..."
39-
docker-compose -f ${DOCKER_CONTEXT} exec kafka sh -c "
39+
docker-compose -f $PY_DOCKER_COMPOSE_FILE exec kafka sh -c "
4040
/usr/bin/kafka-configs --zookeeper zookeeper:2181 \
4141
--alter --add-config 'producer_byte_rate=1,consumer_byte_rate=1,request_percentage=001' \
4242
--entity-name throttled_client --entity-type clients"
4343

4444
await_http "schema-registry" "http://localhost:8081"
45+
4546
await_http "schema-registry-basic-auth" "http://localhost:8083"
4647

0 commit comments

Comments
 (0)