Docker tests: don't use DOCKER_ prefixed env vars since they (may) have external meaning

edenhill · edenhill · commit e126de1f18db · 2020-10-26T09:15:31.000+01:00
.. to docker-compose
diff --git a/tests/docker/.env b/tests/docker/.env
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 
-export DOCKER_SOURCE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-export DOCKER_CONTEXT=$DOCKER_SOURCE/docker-compose.yaml
-export DOCKER_BIN=$DOCKER_SOURCE/bin
-export DOCKER_CONF=$DOCKER_SOURCE/conf
-export TLS=$DOCKER_CONF/tls
+export PY_DOCKER_SOURCE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+export PY_DOCKER_COMPOSE_FILE=$PY_DOCKER_SOURCE/docker-compose.yaml
+export PY_DOCKER_CONTEXT="python-test-$(uuidgen)"
+export PY_DOCKER_BIN=$PY_DOCKER_SOURCE/bin
+export PY_DOCKER_CONF=$PY_DOCKER_SOURCE/conf
+export TLS=$PY_DOCKER_CONF/tls
 
 export MY_BOOTSTRAP_SERVER_ENV=localhost:29092
 export MY_SCHEMA_REGISTRY_URL_ENV=http://$(hostname):8081
diff --git a/tests/docker/bin/certify.sh b/tests/docker/bin/certify.sh
@@ -2,10 +2,10 @@
 
 set -eu
 
-DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+PY_DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 export PASS="abcdefgh"
 
-source ${DOCKER_BIN}/../.env
+source ${PY_DOCKER_BIN}/../.env
 
 mkdir -p ${TLS}
 
@@ -17,11 +17,11 @@ fi
 HOST=$(hostname -f)
 
 echo "Creating ca-cert..."
-${DOCKER_BIN}/gen-ssl-certs.sh ca ${TLS}/ca-cert ${HOST}
+${PY_DOCKER_BIN}/gen-ssl-certs.sh ca ${TLS}/ca-cert ${HOST}
 echo "Creating server cert..."
-${DOCKER_BIN}/gen-ssl-certs.sh -k server ${TLS}/ca-cert  ${TLS}/ ${HOST} ${HOST}
+${PY_DOCKER_BIN}/gen-ssl-certs.sh -k server ${TLS}/ca-cert  ${TLS}/ ${HOST} ${HOST}
 echo "Creating client cert..."
-${DOCKER_BIN}/gen-ssl-certs.sh client ${TLS}/ca-cert ${TLS}/ ${HOST} ${HOST}
+${PY_DOCKER_BIN}/gen-ssl-certs.sh client ${TLS}/ca-cert ${TLS}/ ${HOST} ${HOST}
 
 echo "Creating key ..."
 openssl rsa -in ${TLS}/client.key -out ${TLS}/client.key  -passin pass:${PASS}
diff --git a/tests/docker/bin/cluster_down.sh b/tests/docker/bin/cluster_down.sh
@@ -2,8 +2,8 @@
 
 set -eu
 
-DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-source ${DOCKER_BIN}/../.env
+PY_DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+source ${PY_DOCKER_BIN}/../.env
 
 echo "Destroying cluster.."
-docker-compose -f ${DOCKER_CONTEXT} down -v --remove-orphans
+docker-compose -f $PY_DOCKER_COMPOSE_FILE down -v --remove-orphans
diff --git a/tests/docker/bin/cluster_up.sh b/tests/docker/bin/cluster_up.sh
@@ -2,8 +2,8 @@
 
 set -eu
 
-DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-source ${DOCKER_BIN}/../.env
+PY_DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+source ${PY_DOCKER_BIN}/../.env
 
 # Wait for http service listener to come up and start serving
 # $1 http service name
@@ -27,20 +27,21 @@ await_http() {
 }
 
 echo "Configuring Environment..."
-source ${DOCKER_SOURCE}/.env
+source ${PY_DOCKER_SOURCE}/.env
 
 echo "Generating SSL certs..."
-${DOCKER_BIN}/certify.sh
+${PY_DOCKER_BIN}/certify.sh
 
 echo "Deploying cluster..."
-docker-compose -f ${DOCKER_CONTEXT} up -d
+docker-compose -f $PY_DOCKER_COMPOSE_FILE up -d
 
 echo "Setting throttle for throttle test..."
-docker-compose -f ${DOCKER_CONTEXT} exec kafka sh -c "
+docker-compose -f $PY_DOCKER_COMPOSE_FILE exec kafka sh -c "
         /usr/bin/kafka-configs  --zookeeper zookeeper:2181 \
                 --alter --add-config 'producer_byte_rate=1,consumer_byte_rate=1,request_percentage=001' \
                 --entity-name throttled_client --entity-type clients"
 
 await_http "schema-registry" "http://localhost:8081"
+
 await_http "schema-registry-basic-auth" "http://localhost:8083"
 
