docker-compose: Move virtualenv outside repo

This will let us bind-mount a different copy of the repo at runtime,
which in turn allows us to use a different copy of teuthology without
having to rebuild the image, or re-bootstrap, if deps haven't changed.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/docs/docker-compose/teuthology/Dockerfile b/docs/docker-compose/teuthology/Dockerfile
index 149e8aca56fcb407febae9ea34e1902dad20428d..fcc9341a60633ddcb8735c1f650282dd554437d1 100644 (file)
--- a/docs/docker-compose/teuthology/Dockerfile
+++ b/docs/docker-compose/teuthology/Dockerfile
@@ -1,6 +1,7 @@
 FROM ubuntu:latest
 ARG SSH_PRIVKEY_FILE=id_ed25519
 ENV DEBIAN_FRONTEND=noninteractive
+ENV VENV=/venv
 RUN apt-get update && \
     apt-get install -y \
     git \

diff --git a/docs/docker-compose/teuthology/teuthology.sh b/docs/docker-compose/teuthology/teuthology.sh
index edc377b54eb6f708406bf4056efdae8ce2661286..e9e32b0dfb8b96044dd19dedc606c03eac4eb776 100755 (executable)
--- a/docs/docker-compose/teuthology/teuthology.sh
+++ b/docs/docker-compose/teuthology/teuthology.sh
@@ -3,7 +3,7 @@
 if [ -n "$SSH_PRIVKEY_FILE" ]; then
     echo "$SSH_PRIVKEY" > $HOME/.ssh/$SSH_PRIVKEY_FILE
 fi
-source /teuthology/virtualenv/bin/activate
+source $VENV/bin/activate
 set -x
 if [ -n "$TESTNODES" ]; then
     for node in $(echo $TESTNODES | tr , ' '); do