From 77d2364022da663c50e4eab8c1b5bc64c00b1ca3 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Mon, 3 Dec 2018 21:42:19 -0500
Subject: [PATCH] Make docker environment interoperable with supervisorctl
 commands

---
 Makefile                                      |  2 +-
 tools/docker-compose/Dockerfile               |  2 +-
 tools/docker-compose/bootstrap_development.sh |  2 +-
 tools/docker-compose/supervisor.conf          | 18 +++++++++---------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index d6ed105cf8..547f1e13fc 100644
--- a/Makefile
+++ b/Makefile
@@ -259,7 +259,7 @@ supervisor:
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/awx/bin/activate; \
 	fi; \
-	supervisord --configuration /supervisor.conf --pidfile=/tmp/supervisor_pid
+	supervisord --pidfile=/tmp/supervisor_pid
 
 # Alternate approach to tmux to run all development tasks specified in
 # Procfile.
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index 5c84245ba1..7fd18c5d19 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -63,6 +63,6 @@ CMD /start_development.sh
 RUN for dir in /var/lib/awx/ /projects /.ansible /var/log/nginx /var/lib/nginx /.local; \
   do mkdir -p $dir; chmod -R g+rwx $dir; chgrp -R root $dir; done
 
-RUN for file in /etc/passwd /supervisor.conf \
+RUN for file in /etc/passwd /etc/supervisord.conf \
   /venv/awx/lib/python2.7/site-packages/awx.egg-link /var/run/nginx.pid; \
   do touch $file; chmod -R g+rwx $file; chgrp -R root $file; done
diff --git a/tools/docker-compose/bootstrap_development.sh b/tools/docker-compose/bootstrap_development.sh
index 0a4d27ee0b..d8e7526444 100755
--- a/tools/docker-compose/bootstrap_development.sh
+++ b/tools/docker-compose/bootstrap_development.sh
@@ -28,7 +28,7 @@ else
 fi
 
 make awx-link
-yes | cp -rf /awx_devel/tools/docker-compose/supervisor.conf /supervisor.conf
+yes | cp -rf /awx_devel/tools/docker-compose/supervisor.conf /etc/supervisord.conf
 
 # AWX bootstrapping
 make version_file
diff --git a/tools/docker-compose/supervisor.conf b/tools/docker-compose/supervisor.conf
index bd07fdffe7..c658e2689d 100644
--- a/tools/docker-compose/supervisor.conf
+++ b/tools/docker-compose/supervisor.conf
@@ -3,7 +3,7 @@ umask = 022
 minfds = 4096
 nodaemon=true
 
-[program:dispatcher]
+[program:awx-dispatcher]
 command = awx-manage run_dispatcher
 autostart = true
 autorestart = true
@@ -11,7 +11,7 @@ redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
-[program:receiver]
+[program:awx-receiver]
 command = python manage.py run_callback_receiver
 autostart = true
 autorestart = true
@@ -19,7 +19,7 @@ redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
-[program:runworker]
+[program:awx-runworker]
 command = python manage.py runworker
 autostart = true
 autorestart = true
@@ -27,7 +27,7 @@ redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
-[program:uwsgi]
+[program:awx-uwsgi]
 command = make uwsgi
 autostart = true
 autorestart = true
@@ -35,7 +35,7 @@ redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
-[program:daphne]
+[program:awx-daphne]
 command = daphne -b 0.0.0.0 -p 8051 awx.asgi:channel_layer
 autostart = true
 autorestart = true
@@ -43,7 +43,7 @@ redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
-[program:nginx]
+[program:awx-nginx]
 command = nginx -g "daemon off;"
 autostart = true
 autorestart = true
@@ -51,7 +51,7 @@ redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
-[program:jupyter]
+[program:awx-jupyter]
 command = make jupyter
 autostart = true
 autorestart = true
@@ -59,8 +59,8 @@ redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
-[group:awx-processes]
-programs=dispatcher,receiver,runworker,uwsgi,daphne,nginx
+[group:tower-processes]
+programs=awx-dispatcher,awx-receiver,awx-runworker,awx-uwsgi,awx-daphne,awx-nginx
 priority=5
 
 [unix_http_server]