From a8d75783a3960182cf3fcde404527d045a08a2b8 Mon Sep 17 00:00:00 2001
From: Matthew Jones <mat@matburt.net>
Date: Fri, 5 Jun 2015 11:18:27 -0400
Subject: [PATCH] Some launch changes and configuration changes to the
 Dockerfile

---
 tools/docker/Dockerfile           | 5 +++--
 tools/docker/README               | 2 +-
 tools/docker/start_development.sh | 7 +++++++
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 tools/docker/start_development.sh

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 76e94e4fb7..5d842f35b3 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -23,7 +23,8 @@ RUN mkdir -p /data/db
 ADD license /etc/awx/license
 ADD license /etc/tower/license
 RUN /etc/init.d/postgresql start; cd /tower ; make migrate ; make init ; /etc/init.d/postgresql stop
-ADD start_local.sh /start_local.sh
+ADD start_everything.sh /start_everything.sh
+ADD start_development.sh /start_development.sh
 
 EXPOSE 8013 8080 27017
-CMD ./start_local.sh
+CMD /start_development.sh
diff --git a/tools/docker/README b/tools/docker/README
index 947c8faad9..32b60e4ec6 100644
--- a/tools/docker/README
+++ b/tools/docker/README
@@ -1,2 +1,2 @@
 sudo docker build --no-cache=true --rm=true -t ansible/tower_devel:latest .
-sudo docker run --name tower_test -it --memory="4g" --cpuset="0,1" -v /home/meyers/ansible/:/tower_devel -p 8013:8013 -p 8080:8080 -p 27017:27017 ansible/tower_devel /bin/bash
+sudo docker run --name tower_test -it --memory="4g" --cpuset="0,1" -v /home/meyers/ansible/:/tower_devel -p 8013:8013 -p 8080:8080 -p 27017:27017 ansible/tower_devel
diff --git a/tools/docker/start_development.sh b/tools/docker/start_development.sh
new file mode 100644
index 0000000000..bf0cc0ae88
--- /dev/null
+++ b/tools/docker/start_development.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+/etc/init.d/postgresql start
+/etc/init.d/redis-server start
+nohup mongod &
+
+/bin/bash