From 72758735c19ce9a35f4fa463e2f206194478891b Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 15 Nov 2019 02:29:38 -0400 Subject: [PATCH] Fix Docker BROKER_URL environment variable Signed-off-by: Roberto Rosario --- docker/Makefile | 2 +- docs/chapters/docker.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 7717d36262..cd972e6b07 100755 --- a/docker/Makefile +++ b/docker/Makefile @@ -86,7 +86,7 @@ docker-staging-container-mayan-start: -e MAYAN_DATABASE_NAME=mayan \ -e MAYAN_DATABASE_PASSWORD=mayanuserpass \ -e MAYAN_DATABASE_USER=mayan \ - -e MAYAN_BROKER_URL="redis://mayan-staging-redis:6379/0" \ + -e MAYAN_CELERY_BROKER_URL="redis://mayan-staging-redis:6379/0" \ -e MAYAN_CELERY_RESULT_BACKEND="redis://mayan-staging-redis:6379/1" \ -v mayan-staging-app:/var/lib/mayan \ mayanedms/mayanedms:$(IMAGE_VERSION) diff --git a/docs/chapters/docker.rst b/docs/chapters/docker.rst index cd3a3a3010..ed9e7d5ad5 100644 --- a/docs/chapters/docker.rst +++ b/docs/chapters/docker.rst @@ -99,7 +99,7 @@ memory. --restart=always \ -p 80:8000 \ -e MAYAN_DATABASES="{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayanuserpass','USER':'mayan','HOST':'172.17.0.1'}}" \ - -e MAYAN_BROKER_URL="redis://172.17.0.1:6379/0" \ + -e MAYAN_CELERY_BROKER_URL="redis://172.17.0.1:6379/0" \ -e MAYAN_CELERY_RESULT_BACKEND="redis://172.17.0.1:6379/1" \ -v /docker-volumes/mayan-edms/media:/var/lib/mayan \ mayanedms/mayanedms: @@ -171,7 +171,7 @@ instead of the IP address of the Docker host (``172.17.0.1``):: --restart=always \ -p 80:8000 \ -e MAYAN_DATABASES="{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayanuserpass','USER':'mayan','HOST':'mayan-edms-postgres'}}" \ - -e MAYAN_BROKER_URL="redis://mayan-edms-redis:6379/0" \ + -e MAYAN_CELERY_BROKER_URL="redis://mayan-edms-redis:6379/0" \ -e MAYAN_CELERY_RESULT_BACKEND="redis://mayan-edms-redis:6379/1" \ -v /docker-volumes/mayan-edms/media:/var/lib/mayan \ mayanedms/mayanedms: