summaryrefslogtreecommitdiffstats
path: root/tools/docker-compose/start_development.sh
diff options
context:
space:
mode:
authorAlanCoding <arominge@redhat.com>2017-02-12 22:13:15 +0100
committerAlanCoding <arominge@redhat.com>2017-02-13 23:36:34 +0100
commitd1a71fb7bee5e9b26f9af53f07d490b415159aac (patch)
tree43f45adb33dcf63375bebaa2311a02bdb4259e1d /tools/docker-compose/start_development.sh
parentMerge pull request #5329 from AlanCoding/disable_sig_jobs (diff)
downloadawx-d1a71fb7bee5e9b26f9af53f07d490b415159aac.tar.xz
awx-d1a71fb7bee5e9b26f9af53f07d490b415159aac.zip
add supervisor option to development environment
Diffstat (limited to 'tools/docker-compose/start_development.sh')
-rwxr-xr-xtools/docker-compose/start_development.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh
index ee94888431..9814a9344c 100755
--- a/tools/docker-compose/start_development.sh
+++ b/tools/docker-compose/start_development.sh
@@ -25,6 +25,7 @@ fi
cp -nR /tmp/ansible_tower.egg-info /tower_devel/ || true
cp /tmp/ansible-tower.egg-link /venv/tower/lib/python2.7/site-packages/ansible-tower.egg-link
+yes | cp -rf /tower_devel/tools/docker-compose/supervisor.conf /supervisor.conf
# Tower bootstrapping
make version_file
@@ -35,4 +36,9 @@ mkdir -p /tower_devel/awx/public/static
mkdir -p /tower_devel/awx/ui/static
# Start the service
-make honcho
+
+if [ -f "/tower_devel/tools/docker-compose/use_dev_supervisor.txt" ]; then
+ make supervisor
+else
+ make honcho
+fi