External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 12:20:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2867 from AlanCoding/supervisor_names

Browse Source 
Make docker environment interoperable with supervisorctl commands

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-01-11 13:28:35 +00:00 committed by GitHub
commit 4f9901db38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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.

2
tools/docker-compose/Dockerfile
View File

@ -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

2
tools/docker-compose/bootstrap_development.sh
View File

@ -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

18
tools/docker-compose/supervisor.conf
View File

@ -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]