diff options
| author | Matthew Jones <matburt@redhat.com> | 2016-10-03 16:39:59 +0200 |
|---|---|---|
| committer | Matthew Jones <matburt@redhat.com> | 2016-10-03 16:40:30 +0200 |
| commit | 959342a5fd33f3b38d294c711b09d23f088e94b7 (patch) | |
| tree | 40b5c718e370ba80749e2bfcb5f4e2938ed62c4b /tools | |
| parent | change migration name to align with version semantic (diff) | |
| download | awx-959342a5fd33f3b38d294c711b09d23f088e94b7.tar.xz awx-959342a5fd33f3b38d294c711b09d23f088e94b7.zip | |
Fixing up unit tests from HA/Clustering work
* Also purge old fact migration tests
* Upgrade some services on various container images
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker-compose/Dockerfile | 2 | ||||
| -rw-r--r-- | tools/docker-compose/unit-tests/Dockerfile | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index ddd54616bb..efa3f7709c 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -11,7 +11,7 @@ RUN yum -y update && yum -y install curl epel-release RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - RUN yum -y localinstall http://download.postgresql.org/pub/repos/yum/9.4/redhat/rhel-6-x86_64/pgdg-centos94-9.4-3.noarch.rpm ADD tools/docker-compose/proot.repo /etc/yum.repos.d/proot.repo -RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git mercurial subversion python-devel python-psycopg2 make postgresql postgresql-devel nodejs python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel proot python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel +RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git mercurial subversion python-devel python-psycopg2 make postgresql postgresql-devel nodejs python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel proot python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel rabbitmq-server RUN pip install flake8 pytest==2.9.2 pytest-pythonpath pytest-django pytest-cov pytest-mock dateutils django-debug-toolbar==1.4 pyflakes==1.0.0 virtualenv RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa RUN mkdir -p /etc/tower diff --git a/tools/docker-compose/unit-tests/Dockerfile b/tools/docker-compose/unit-tests/Dockerfile index e4b4dfb83a..cb95cfc7d8 100644 --- a/tools/docker-compose/unit-tests/Dockerfile +++ b/tools/docker-compose/unit-tests/Dockerfile @@ -20,6 +20,7 @@ RUN yum install -y \ /usr/bin/pg_config \ openldap-devel \ postgresql-devel \ + rabbitmq-server \ libtool-ltdl-devel # NOTE: The following steps work for tower-3.0.0 |