Merge pull request #44 from harpatel1/214B

Updating Flower configuration in docker compose file
openmrs · Jun 25, 2020 · d758409 · d758409
2 parents d371bad + 2f41309
commit d758409
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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: