Update Docker make file

- Include PIP proxies.
- Add docker compose targets.

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>

mayan/apps/platform/classes.py

@@ -181,5 +181,28 @@ class PlatformTemplateSupervisordDocker(PlatformTemplate):
         return {'workers': Worker.all()}
 
 
+class PlatformTemplateWorkerQueues(PlatformTemplate):
+    label = _('Template showing the queues of a worker.')
+    name = 'worker_queues'
+
+    variables = (
+        Variable(
+            name='WORKER_NAME', default=None,
+            environment_name='MAYAN_WORKER_NAME'
+        ),
+    )
+
+    def get_context(self):
+        worker_name = self.get_variables_context().get('WORKER_NAME')
+        queues = Worker.get(name=worker_name).queues
+
+        return {
+            'queues': queues, 'queue_names': sorted(
+                map(lambda x: x.name, queues)
+            )
+        }
+
+
 PlatformTemplate.register(klass=PlatformTemplateSupervisord)
 PlatformTemplate.register(klass=PlatformTemplateSupervisordDocker)
+PlatformTemplate.register(klass=PlatformTemplateWorkerQueues)

mayan/apps/platform/templates/platform/supervisord_docker.tmpl

@@ -1,11 +1,7 @@
-[supervisord]
-environment=
-    DJANGO_SETTINGS_MODULE="%(ENV_MAYAN_SETTINGS_MODULE)s"
-
 [program:mayan-gunicorn]
 autorestart = false
 autostart = true
-command = /bin/bash -c "${MAYAN_GUNICORN_BIN} -w ${MAYAN_GUNICORN_WORKERS} mayan.wsgi --max-requests 500 --max-requests-jitter 50 --worker-class gevent --bind 0.0.0.0:8000 --env DJANGO_SETTINGS_MODULE=${MAYAN_SETTINGS_MODULE}" --timeout ${MAYAN_GUNICORN_TIMEOUT}
+command = /bin/bash -c "${MAYAN_GUNICORN_BIN} -w ${MAYAN_GUNICORN_WORKERS} mayan.wsgi --max-requests 500 --max-requests-jitter 50 --worker-class sync --bind 0.0.0.0:8000 --env DJANGO_SETTINGS_MODULE=${MAYAN_SETTINGS_MODULE}" --timeout ${MAYAN_GUNICORN_TIMEOUT}
 redirect_stderr = true
 stderr_logfile = /dev/fd/2
 stderr_logfile_maxbytes = 0
@@ -13,16 +9,6 @@ stdout_logfile = /dev/fd/1
 stdout_logfile_maxbytes = 0
 user = mayan
 
-[program:redis]
-autorestart = false
-autostart = true
-command = /bin/bash -c "if [ ${MAYAN_CELERY_BROKER_URL} == ${MAYAN_DEFAULT_CELERY_BROKER_URL} ] && [ ${MAYAN_CELERY_RESULT_BACKEND} == ${MAYAN_DEFAULT_CELERY_RESULT_BACKEND} ];then /usr/bin/redis-server /etc/redis/;fi"
-stderr_logfile = /dev/fd/2
-stderr_logfile_maxbytes = 0
-stdout_logfile = /dev/fd/1
-stdout_logfile_maxbytes = 0
-user = root
-
 {% for worker in workers %}
 [program:mayan-worker-{{ worker.name }}]
 autorestart = false

mayan/apps/platform/templates/platform/worker_queues.tmpl

@@ -0,0 +1 @@
+{{ queue_names|join:"," }}