External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-18 21:21:21 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5868 from ryanpetrello/python-packaging-is-a-disaster

Browse Source 
pin virtualenv < 20 for ansible venv builds

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-02-10 22:31:26 +00:00 committed by GitHub
commit 7b4adfcc15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/docker-compose/Dockerfile
View File

@ -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

2
tools/docker-isolated/Dockerfile
View File

@ -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