diff --git a/HISTORY.rst b/HISTORY.rst index ce8b3c3e02..3cab638bdf 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,3 +1,7 @@ +3.3.1 (2019-XX-XX) +================== +- Update Celery broker environment variable in the docker installer. + 3.3 (2019-12-03) ================ - Add support for icon shadows. diff --git a/contrib/scripts/install/docker.sh b/contrib/scripts/install/docker.sh index b6e852eaba..80d88244bb 100755 --- a/contrib/scripts/install/docker.sh +++ b/contrib/scripts/install/docker.sh @@ -127,7 +127,7 @@ if [ "$USE_DOCKER_NETWORK" = true ]; then REDIS_PORT_ARGUMENT="" MAYAN_DATABASE_PORT_ARGUMENT="" MAYAN_DATABASE_HOST_ARGUMENT="-e MAYAN_DATABASE_HOST=$DOCKER_POSTGRES_CONTAINER" - MAYAN_BROKER_URL_ARGUMENT="-e MAYAN_BROKER_URL=redis://$DOCKER_REDIS_CONTAINER:6379/0" + MAYAN_CELERY_BROKER_URL_ARGUMENT="-e MAYAN_CELERY_BROKER_URL=redis://$DOCKER_REDIS_CONTAINER:6379/0" MAYAN_CELERY_RESULT_BACKEND_ARGUMENT="-e MAYAN_CELERY_RESULT_BACKEND=redis://$DOCKER_REDIS_CONTAINER:6379/1" else NETWORK_ARGUMENT="" @@ -135,7 +135,7 @@ else REDIS_PORT_ARGUMENT="-e $DOCKER_REDIS_PORT:6379" MAYAN_DATABASE_PORT_ARGUMENT="-e MAYAN_DATABASE_PORT=$DOCKER_POSTGRES_PORT" MAYAN_DATABASE_HOST_ARGUMENT="-e MAYAN_DATABASE_HOST=172.17.0.1" - MAYAN_BROKER_URL_ARGUMENT="-e MAYAN_BROKER_URL=redis://172.17.0.1:6379/0" + MAYAN_CELERY_BROKER_URL_ARGUMENT="-e MAYAN_CELERY_BROKER_URL=redis://172.17.0.1:6379/0" MAYAN_CELERY_RESULT_BACKEND_ARGUMENT="-e MAYAN_CELERY_RESULT_BACKEND=redis://172.17.0.1:6379/1" fi @@ -187,7 +187,7 @@ $MAYAN_DATABASE_PORT_ARGUMENT \ -e MAYAN_DATABASE_PASSWORD=$DATABASE_PASSWORD \ -e MAYAN_DATABASE_USER=$DATABASE_USER \ -e MAYAN_DATABASE_CONN_MAX_AGE=0 \ -$MAYAN_BROKER_URL_ARGUMENT \ +$MAYAN_CELERY_BROKER_URL_ARGUMENT \ $MAYAN_CELERY_RESULT_BACKEND_ARGUMENT \ -v $DOCKER_MAYAN_VOLUME:/var/lib/mayan \ $DOCKER_MAYAN_IMAGE >/dev/null