Revert "Merge branch 'release_3.0.0' into devel"

This reverts commit 3cedfe6c679e5b289bd0a27defb6198d063ba8e8.
This commit is contained in:
Matthew Jones
2016-07-07 12:40:10 -04:00
parent 22437f80ed
commit 6b73fb2c27
321 changed files with 8400 additions and 8261 deletions

View File

@@ -7,9 +7,10 @@ ENV LC_ALL en_US.UTF-8
RUN apt-get update && apt-get install -y software-properties-common python-software-properties curl
RUN add-apt-repository -y ppa:chris-lea/redis-server; add-apt-repository -y ppa:chris-lea/zeromq; add-apt-repository -y ppa:chris-lea/node.js; add-apt-repository -y ppa:ansible/ansible; add-apt-repository -y ppa:jal233/proot;
RUN curl -sL https://deb.nodesource.com/setup_0.12 | bash -
RUN curl -sL https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 && apt-key adv --fetch-keys http://www.postgresql.org/media/keys/ACCC4CF8.asc
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | tee /etc/apt/sources.list.d/postgres-9.4.list
RUN apt-get update && 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 libgss-dev libkrb5-dev && apt-get autoremove --purge -y && rm -rf /var/lib/apt/lists/*
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 pytest 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

View File

@@ -1,10 +0,0 @@
FROM ubuntu:16.04
RUN PACKAGES="\
rsync \
lsyncd \
" && \
apt-get update && \
apt-get install -y $PACKAGES && \
apt-get autoremove --purge -y && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

View File

@@ -18831,6 +18831,10 @@ awx/ui/static/lib/select2/dist/css/select2.css
awx/ui/templates/ui/index.html
config/awx-httpd-443.conf
config/awx-httpd-80.conf
config/awx-munin-el.conf
config/awx-munin-ubuntu.conf
config/awx-munin.conf
config/awx_munin_tower_jobs
config/wsgi.py
docs/licenses/Babel.txt
docs/licenses/IP.txt
@@ -19009,6 +19013,17 @@ requirements/requirements.txt
requirements/requirements_dev.txt
requirements/requirements_jenkins.txt
requirements/requirements_python26.txt
tools/munin_monitors/callbackr_alive
tools/munin_monitors/celery_alive
tools/munin_monitors/mongo_conn
tools/munin_monitors/mongo_docs
tools/munin_monitors/mongo_mem
tools/munin_monitors/mongo_ops
tools/munin_monitors/postgres_alive
tools/munin_monitors/redis_alive
tools/munin_monitors/socketio_alive
tools/munin_monitors/taskmanager_alive
tools/munin_monitors/tower_jobs
tools/scripts/ansible-tower-service
tools/scripts/request_tower_configuration.ps1
tools/scripts/request_tower_configuration.sh