From 097fba690bd78c3ca4a0edcce7a814b980ad9a9c Mon Sep 17 00:00:00 2001
From: Leigh Johnson <ljohnson@ansible.com>
Date: Fri, 1 Apr 2016 10:35:07 -0400
Subject: [PATCH] update docker-compose build, resolves #1377

---
 tools/docker-compose.yml                  | 12 ------------
 tools/docker-compose/Dockerfile           |  2 +-
 tools/docker-compose/start_development.sh |  1 -
 tools/docker/start_development.sh         |  1 -
 tools/docker/start_everything.sh          |  1 -
 5 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index 5cfd679b8a..4b506c4f36 100644
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -6,7 +6,6 @@ tower:
   links:
     - postgres
     - redis
-    - mongo
     - graphite
   volumes:
     - ../:/tower_devel
@@ -18,17 +17,6 @@ redis:
   image: redis:3.0.1
   # ports:
   #   - 6379:6379
-mongo:
-  image: mongo:3.0
-  # ports:
-  #   - 27017:27017
-dockerui:
-  image: dockerui/dockerui
-  ports:
-    - "9000:9000"
-  privileged: true
-  volumes:
-    - /var/run/docker.sock:/var/run/docker.sock
 graphite:
   image: hopsoft/graphite-statsd
   ports:
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index 72568d3dfc..8c05abf424 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y software-properties-common python-softw
 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 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://repo.mongodb.org/apt/ubuntu "$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.0.list && echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | tee /etc/apt/sources.list.d/postgres-9.4.list
+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
 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
diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh
index 4368f41779..c1711624d7 100755
--- a/tools/docker-compose/start_development.sh
+++ b/tools/docker-compose/start_development.sh
@@ -4,7 +4,6 @@ set +x
 # Wait for the databases to come up
 ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=postgres port=5432" all
 ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=redis port=6379" all
-ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=mongo port=27017" all
 
 # In case Tower in the container wants to connect to itself, use "docker exec" to attach to the container otherwise
 /etc/init.d/ssh start
diff --git a/tools/docker/start_development.sh b/tools/docker/start_development.sh
index c500ea0cde..96b4d49d9e 100755
--- a/tools/docker/start_development.sh
+++ b/tools/docker/start_development.sh
@@ -3,7 +3,6 @@
 /etc/init.d/ssh start
 /etc/init.d/postgresql start
 /etc/init.d/redis-server start
-nohup mongod &
 if ! [ -d "/tower_devel/awx/lib/site-packages" ]; then
     ln -s /tower/awx/lib/site-packages /tower_devel/awx/lib/site-packages
 fi
diff --git a/tools/docker/start_everything.sh b/tools/docker/start_everything.sh
index 9c901a982c..4002a300a8 100755
--- a/tools/docker/start_everything.sh
+++ b/tools/docker/start_everything.sh
@@ -2,7 +2,6 @@
 
 /etc/init.d/postgresql start
 /etc/init.d/redis-server start
-nohup mongod --smallfiles &
 
 (cd /tower_devel && make server &&
 /bin/bash)