fix failing message broker setup (#1034)

Issue: #1033 Signed-off-by: Ndibe Raymond Olisaemeka <[email protected]> Co-authored-by: Ndibe Raymond Olisaemeka <[email protected]>
unstructuredstudio · Dec 16, 2023 · 5c506c2 · 5c506c2
1 parent 3332579
commit 5c506c2
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 24 deletions.
diff --git a/.github/workflows/create_destroy_test_vm.yaml b/.github/workflows/create_destroy_test_vm.yaml
@@ -40,12 +40,6 @@ jobs:
 
           echo "CHECKOUT_COMMIT_REF=$CHECKOUT_COMMIT_REF" >> $GITHUB_ENV
           echo "CHECKOUT_REPO=$CHECKOUT_REPO" >> $GITHUB_ENV
-          echo "********************************* merge_commit_sha=$merge_commit_sha"
-          echo "********************************* head_ref=$head_ref"
-          echo "********************************* target_repo=$target_repo"
-          echo "********************************* pr_repo=$pr_repo"
-          echo "********************************* CHECKOUT_COMMIT_REF=$CHECKOUT_COMMIT_REF"
-          echo "********************************* CHECKOUT_REPO=$CHECKOUT_REPO"
 
 # careful with this as you are checking out the source branch of the PR
 # which is a potential security risk. Only do this when you know what you are doing
@@ -112,12 +106,12 @@ jobs:
       - name: Set output
         id: set_output
         run: |
-          echo "::set-output name=NEW_DROPLET_IP::$NEW_DROPLET_IP"
-          echo "::set-output name=FRONTEND_DOMAIN::$FRONTEND_DOMAIN"
-          echo "::set-output name=API_DOMAIN::$API_DOMAIN"
-          echo "::set-output name=MEDIA_DOMAIN::$MEDIA_DOMAIN"
-          echo "::set-output name=CHECKOUT_COMMIT_REF::${{ env.CHECKOUT_COMMIT_REF }}"
-          echo "::set-output name=CHECKOUT_REPO::${{ env.CHECKOUT_REPO }}"
+          echo "NEW_DROPLET_IP=$NEW_DROPLET_IP" >> $GITHUB_OUTPUT
+          echo "FRONTEND_DOMAIN=$FRONTEND_DOMAIN" >> $GITHUB_OUTPUT
+          echo "API_DOMAIN=$API_DOMAIN" >> $GITHUB_OUTPUT
+          echo "MEDIA_DOMAIN=$MEDIA_DOMAIN" >> $GITHUB_OUTPUT
+          echo "CHECKOUT_COMMIT_REF=${{ env.CHECKOUT_COMMIT_REF }}" >> $GITHUB_OUTPUT
+          echo "CHECKOUT_REPO=${{ env.CHECKOUT_REPO }}" >> $GITHUB_OUTPUT
     outputs:
       NEW_DROPLET_IP: ${{ steps.set_output.outputs.NEW_DROPLET_IP }}
       FRONTEND_DOMAIN: ${{ steps.set_output.outputs.FRONTEND_DOMAIN }}
@@ -252,14 +246,11 @@ jobs:
             POSTGRES_USER=postgres
             POSTGRES_PASSWORD=postgres
             POSTGRES_HOST=db
-            GF_ADMIN_USER=admin
-            GF_ADMIN_PASSWORD=admin
-            RABBITMQ_DEFAULT_USER=admin
-            RABBITMQ_DEFAULT_PASS=admin
+            RABBITMQ_USERNAME=admin
+            RABBITMQ_PASSWORD=admin
+            RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS=true
             CELERY_BROKER=amqp://admin:admin@rabbitmq:5672/
             CELERY_BACKEND=django-db
-            CELERY_FLOWER_USER=admin
-            CELERY_FLOWER_PASSWORD=admin
             PROXY_COUNT=0
             DETECT_MISCONFIG=0
             SUPERUSER_PASSWORD=dummy_password

diff --git a/single_vm_deployment/docker-compose.unscalable.prod.yml b/single_vm_deployment/docker-compose.unscalable.prod.yml
@@ -62,7 +62,7 @@ services:
     container_name: rabbitmq
     env_file:
       - ./zubhub_backend/.env
-    image: rabbitmq:3-management
+    image: bitnami/rabbitmq:3.11
     restart: on-failure
     ports:
       - 5672:5672

diff --git a/test_vm_deployment/deploy_test_fullstack.sh b/test_vm_deployment/deploy_test_fullstack.sh
@@ -49,7 +49,7 @@ echo "done removing uneccessary frontend files and folders"
 
 echo "stopping and rebuilding the containers"
 cd /home/
-# pull the lastest images defined in the docker-compose file. This is to avoid using stale images
+# pull the latest images defined in the docker-compose file. This is to avoid using stale images
 docker-compose -f docker-compose.test.yml --env-file ./zubhub_backend/.env pull
 docker-compose -f docker-compose.test.yml --env-file ./zubhub_backend/.env down
 sleep 10s

diff --git a/test_vm_deployment/docker-compose.test.yml b/test_vm_deployment/docker-compose.test.yml
@@ -50,7 +50,7 @@ services:
     container_name: rabbitmq
     env_file:
       - ./zubhub_backend/.env
-    image: rabbitmq:3-management
+    image: bitnami/rabbitmq:3.11
     restart: on-failure
     ports:
       - 5672:5672

diff --git a/zubhub_backend/compose/make_backend_env.sh b/zubhub_backend/compose/make_backend_env.sh
@@ -46,8 +46,10 @@ POSTGRES_HOST=db
 #DOSPACE_ENDPOINT_URL=<endpoint url>
 #DOSPACE_BUCKETNAME=<bucket name>
 
-RABBITMQ_DEFAULT_USER=admin
-RABBITMQ_DEFAULT_PASS=admin
+RABBITMQ_USERNAME=admin
+RABBITMQ_PASSWORD=admin
+# https://github.com/bitnami/containers/issues/53771
+RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS=true
 
 CELERY_BROKER=amqp://admin:admin@rabbitmq:5672/
 CELERY_BACKEND=django-db

diff --git a/zubhub_backend/docker-compose.yml b/zubhub_backend/docker-compose.yml
@@ -48,7 +48,7 @@ services:
   rabbitmq:
     container_name: rabbitmq
     env_file: .env
-    image: bitnami/rabbitmq
+    image: bitnami/rabbitmq:3.11
     restart: on-failure
     ports:
       - 5672:5672