From ad5d0b92dbe5ad0a24ed850208f4f0ce25904405 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 10 Feb 2020 16:31:34 -0500 Subject: [PATCH] pin virtualenv < 20 for ansible venv builds virtualenv version 20 just got released and broken a bunch of stuff (like the --system-site-packages flag) --- tools/docker-compose/Dockerfile | 2 +- tools/docker-isolated/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 7607eee8e0..31dd1e0306 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -78,7 +78,7 @@ RUN openssl req -nodes -newkey rsa:2048 -keyout /etc/nginx/nginx.key -out /etc/n RUN openssl x509 -req -days 365 -in /etc/nginx/nginx.csr -signkey /etc/nginx/nginx.key -out /etc/nginx/nginx.crt RUN chmod 640 /etc/nginx/nginx.{csr,key,crt} -RUN python3 -m ensurepip && pip3 install virtualenv flake8 +RUN python3 -m ensurepip && pip3 install "virtualenv < 20" flake8 RUN pip3 install supervisor ADD Makefile /tmp/Makefile diff --git a/tools/docker-isolated/Dockerfile b/tools/docker-isolated/Dockerfile index e3d78b732d..16638f2b6f 100644 --- a/tools/docker-isolated/Dockerfile +++ b/tools/docker-isolated/Dockerfile @@ -2,7 +2,7 @@ ARG TAG=latest FROM ansible/awx_devel:${TAG} RUN yum install -y gcc python36-devel -RUN python3 -m ensurepip && pip3 install virtualenv ansible-runner +RUN python3 -m ensurepip && pip3 install "virtualenv < 20" ansible-runner RUN yum remove -y gcc python36-devel && rm -rf /var/cache/yum RUN rm -f /etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_rsa_key