From 2f41309f477699ce2cceeb5747e291b5471b1e14 Mon Sep 17 00:00:00 2001 From: Harsh Patel Date: Wed, 24 Jun 2020 14:41:53 -0400 Subject: [PATCH] Updating Flower configuration in docker compose file --- files/oclapi-demo/docker-compose.yml | 4 +++- files/oclapi-prd/docker-compose.yml | 4 +++- files/oclapi-qa/docker-compose.yml | 4 +++- files/oclapi-stg/docker-compose.yml | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/files/oclapi-demo/docker-compose.yml b/files/oclapi-demo/docker-compose.yml index 8d94672..bf73c08 100644 --- a/files/oclapi-demo/docker-compose.yml +++ b/files/oclapi-demo/docker-compose.yml @@ -43,6 +43,8 @@ services: - AWS_ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY - AWS_STORAGE_BUCKET_NAME + - FLOWER_USER=${FLOWER_USER-floweruser} + - FLOWER_PWD=${FLOWER_PWD-Flower123} restart: always healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8000/admin/authtoken/token/"] @@ -105,7 +107,7 @@ services: test: "exit 0" flower: image: openconceptlab/oclapi:${ENVIRONMENT-production} - command: celery -A tasks flower --basic_auth=root:${ROOT_PASSWORD-Root123} + command: celery -A tasks flower --basic_auth=${FLOWER_USER-floweruser}:${FLOWER_PWD-Flower123} --conf=flowerconfig.py ports: - "5556:5555" depends_on: diff --git a/files/oclapi-prd/docker-compose.yml b/files/oclapi-prd/docker-compose.yml index 926ad7d..cdfedda 100644 --- a/files/oclapi-prd/docker-compose.yml +++ b/files/oclapi-prd/docker-compose.yml @@ -42,6 +42,8 @@ services: - AWS_ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY - AWS_STORAGE_BUCKET_NAME + - FLOWER_USER=${FLOWER_USER-floweruser} + - FLOWER_PWD=${FLOWER_PWD-Flower123} restart: always healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8000/admin/authtoken/token/"] @@ -104,7 +106,7 @@ services: test: "exit 0" flower: image: openconceptlab/oclapi:${ENVIRONMENT-production} - command: celery -A tasks flower --basic_auth=root:${ROOT_PASSWORD-Root123} + command: celery -A tasks flower --basic_auth=${FLOWER_USER-floweruser}:${FLOWER_PWD-Flower123} --conf=flowerconfig.py ports: - "5555:5555" depends_on: diff --git a/files/oclapi-qa/docker-compose.yml b/files/oclapi-qa/docker-compose.yml index 4934d13..c15da76 100644 --- a/files/oclapi-qa/docker-compose.yml +++ b/files/oclapi-qa/docker-compose.yml @@ -43,6 +43,8 @@ services: - AWS_ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY - AWS_STORAGE_BUCKET_NAME + - FLOWER_USER=${FLOWER_USER-floweruser} + - FLOWER_PWD=${FLOWER_PWD-Flower123} restart: always healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8000/admin/authtoken/token/"] @@ -105,7 +107,7 @@ services: test: "exit 0" flower: image: openconceptlab/oclapi:${ENVIRONMENT-production} - command: celery -A tasks flower --basic_auth=root:${ROOT_PASSWORD-Root123} + command: celery -A tasks flower --basic_auth=${FLOWER_USER-floweruser}:${FLOWER_PWD-Flower123} --conf=flowerconfig.py ports: - "5555:5555" depends_on: diff --git a/files/oclapi-stg/docker-compose.yml b/files/oclapi-stg/docker-compose.yml index 926ad7d..cdfedda 100644 --- a/files/oclapi-stg/docker-compose.yml +++ b/files/oclapi-stg/docker-compose.yml @@ -42,6 +42,8 @@ services: - AWS_ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY - AWS_STORAGE_BUCKET_NAME + - FLOWER_USER=${FLOWER_USER-floweruser} + - FLOWER_PWD=${FLOWER_PWD-Flower123} restart: always healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8000/admin/authtoken/token/"] @@ -104,7 +106,7 @@ services: test: "exit 0" flower: image: openconceptlab/oclapi:${ENVIRONMENT-production} - command: celery -A tasks flower --basic_auth=root:${ROOT_PASSWORD-Root123} + command: celery -A tasks flower --basic_auth=${FLOWER_USER-floweruser}:${FLOWER_PWD-Flower123} --conf=flowerconfig.py ports: - "5555:5555" depends_on: