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

Merge pull request #3626 from ryanpetrello/no_ln_py3

Browse Source 
fix busted CI

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-04-04 23:15:42 +00:00 committed by GitHub
commit 2423d9df44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/requirements_dev.txt
View File

@ -13,7 +13,7 @@ pytest-django
pytest-pythonpath
pytest-mock
pytest-timeout
pytest-xdist
pytest-xdist<1.28.0
logutils
jupyter
matplotlib

4
tools/docker-compose/Dockerfile
View File

@ -19,9 +19,7 @@ RUN yum -y update && yum -y install openssh-server ansible mg vim tmux \
zanata-python-client gettext gcc-c++ libcurl-devel bzip2 \
rsync
RUN ln -s /usr/bin/python36 /usr/bin/python3
RUN python36 -m ensurepip
RUN python3 -m ensurepip
RUN pip3 install virtualenv
RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa
RUN mkdir -p /data/db

3
tools/docker-isolated/Dockerfile
View File

@ -7,8 +7,7 @@ ADD requirements/requirements_ansible.txt requirements/requirements_ansible_git.
RUN yum -y update && yum -y install curl epel-release
RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git python-devel python36 python36-devel python-psycopg2 make python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap zanata-python-client gettext gcc-c++ libcurl-devel python-pycurl bzip2
RUN ln -s /usr/bin/python36 /usr/bin/python3
RUN python36 -m ensurepip
RUN python3 -m ensurepip
RUN pip3 install virtualenv
RUN pip3 install ansible-runner
WORKDIR /tmp