summaryrefslogtreecommitdiffstats
path: root/tools/docker-compose
diff options
context:
space:
mode:
authorWayne Witzel III <wwitzel@redhat.com>2016-01-28 18:01:12 +0100
committerWayne Witzel III <wwitzel@redhat.com>2016-02-02 00:37:56 +0100
commit71a1547c3a404fd31704b541274f773c43359357 (patch)
tree9fa53652c27739302141066e0fda0ad6420cf229 /tools/docker-compose
parentupdating commands tests (diff)
downloadawx-71a1547c3a404fd31704b541274f773c43359357.tar.xz
awx-71a1547c3a404fd31704b541274f773c43359357.zip
fixing ad_hoc imports
flake8 fixes Fix and add awx/api/tests added fact tests added proper xml reports for jenkins added jenkins requirements and adjusted Makefile target
Diffstat (limited to 'tools/docker-compose')
-rw-r--r--tools/docker-compose/Dockerfile5
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index e2e57fd4a1..b4a25a78cc 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -12,10 +12,7 @@ RUN echo "deb http://repo.mongodb.org/apt/ubuntu "$(lsb_release -sc)"/mongodb-or
RUN apt-get update
RUN apt-get install -y openssh-server ansible mg vim tmux git mercurial subversion python-dev python-psycopg2 make postgresql-client libpq-dev nodejs python-psutil libxml2-dev libxslt-dev lib32z1-dev libsasl2-dev libldap2-dev libffi-dev libzmq-dev proot python-pip libxmlsec1-dev swig redis-server && rm -rf /var/lib/apt/lists/*
RUN pip install flake8
-RUN pip install pytest
-RUN pip install pytest-pythonpath
-RUN pip install pytest-django
-RUN pip install pytest-cov
+RUN pip install pytest pytest-pythonpath pytest-django pytest-cov
RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa
RUN mkdir -p /etc/tower
RUN mkdir -p /data/db