Merge pull request #2684 from GaryPWhite/main

add rabbitmq docker configuration

Makefile

@@ -148,7 +148,7 @@ compose-run-database:
 	@ echo
 	@ docker-compose -f docker-compose.yml -f database-compose.yml up --build
 
-docker-build: docker-build-backend docker-build-frontend docker-build-database
+docker-build: docker-build-backend docker-build-frontend docker-build-database docker-build-rabbitmq
 
 docker-build-backend:
 	@ docker build -t augurlabs/augur:backend -f util/docker/backend/Dockerfile .
@@ -159,6 +159,8 @@ docker-build-frontend:
 docker-build-database:
 	@ docker build -t augurlabs/augur:database -f util/docker/database/Dockerfile .
 
+docker-build-rabbitmq:
+	@ docker build -t augurlabs/augur:rabbitmq -f util/docker/rabbitmq/Dockerfile .
 
 docker-run-backend:
 	@ - docker stop augur_backend
@@ -174,3 +176,8 @@ docker-run-database:
 	@ - docker stop augur_database
 	@ - docker rm augur_database
 	docker run -p 5434:5432 --name augur_database augurlabs/augur:database
+
+docker-run-rabbitmq:
+	@ - docker stop augur_rabbitmq
+	@ - docker rm augur_rabbitmq
+	docker run -p 5434:5432 --name augur_rabbitmq augurlabs/augur:rabbitmq

README.md

@@ -96,6 +96,7 @@ Contributors
 - `Dawn Foster <https://github.com/geekygirldawn/>`_
 - `Ivana Atanasova <https://github.com/ivanayov/>`_
 - `Georg J.P. Link <https://github.com/GeorgLink/>`_
+- `Gary P White <https://github.com/garypwhite/>`_
 
 GSoC 2022 participants
 -----------------------

docker-compose-externalDB.yml

@@ -6,6 +6,20 @@ services:
     ports:
      - 6379:6379
 
+  rabbitmq:
+  image: augur-rabbitmq
+  build:
+    context: .
+    dockerfile: ./docker/rabbitmq/Dockerfile
+  # ports for amqp connections / management api
+  ports:
+    - 5671:5671
+    - 5672:5672
+    - 15671:15671
+    - 15672:15672
+  environment:
+    - "RABBIT_MQ_DEFAULT_USER=${AUGUR_RABBITMQ_USERNAME:-augur}"
+    - "RABBIT_MQ_DEFAULT_PASSWORD=${AUGUR_RABBITMQ_PASSWORD:-password123}"
 
   augur:
     image: augurlabs/augur-new:latest
@@ -27,6 +41,7 @@ services:
       - "AUGUR_GITHUB_USERNAME=${AUGUR_GITHUB_USERNAME}"
       - "AUGUR_GITLAB_USERNAME=${AUGUR_GITLAB_USERNAME}"
       - REDIS_CONN_STRING=redis://redis:6379
+      - RABBITMQ_CONN_STRING=amqp://${AUGUR_RABBITMQ_USERNAME:-augur}:${AUGUR_RABBITMQ_PASSWORD:-password123}@rabbitmq:5672/augur_vhost
     depends_on:
       - redis
 

docker-compose.yml

@@ -19,6 +19,20 @@ services:
     ports:
      - 6379:6379
 
+  rabbitmq:
+    image: augur-rabbitmq
+    build:
+      context: .
+      dockerfile: ./docker/rabbitmq/Dockerfile
+    # ports for amqp connections / management api
+    ports:
+      - 5671:5671
+      - 5672:5672
+      - 15671:15671
+      - 15672:15672
+    environment:
+      - "RABBIT_MQ_DEFAULT_USER=${AUGUR_RABBITMQ_USERNAME:-augur}"
+      - "RABBIT_MQ_DEFAULT_PASSWORD=${AUGUR_RABBITMQ_PASSWORD:-password123}"
 
   augur:
     image: augur-new:latest
@@ -40,9 +54,11 @@ services:
       - "AUGUR_GITHUB_USERNAME=${AUGUR_GITHUB_USERNAME}"
       - "AUGUR_GITLAB_USERNAME=${AUGUR_GITLAB_USERNAME}"
       - REDIS_CONN_STRING=redis://redis:6379
+      - RABBITMQ_CONN_STRING=amqp://${AUGUR_RABBITMQ_USERNAME:-augur}:${AUGUR_RABBITMQ_PASSWORD:-password123}@rabbitmq:5672/augur_vhost
     depends_on:
       - augur-db
       - redis
+      - rabbitmq
 
 volumes:
   facade:

docker/rabbitmq/Dockerfile

@@ -0,0 +1,12 @@
+FROM rabbitmq:3.12-management-alpine
+
+LABEL maintainer="574/augur@simplelogin.com"
+LABEL version="0.62.0"
+
+COPY --chown=rabbitmq:rabbitmq ./docker/rabbitmq/augur.conf /etc/rabbitmq/conf.d/
+
+RUN chmod 777 /etc/rabbitmq/conf.d/augur.conf
+
+RUN touch /etc/rabbitmq/advanced.config \
+  && chmod 544 /etc/rabbitmq/advanced.config \
+  && echo '[ {rabbit, [ {consumer_timeout, undefined} ]} ].' >> /etc/rabbitmq/advanced.config

docker/rabbitmq/augur.conf

@@ -0,0 +1,10 @@
+default_vhost = augur_vhost
+
+default_permissions.configure = .*
+default_permissions.read = .*
+default_permissions.write = .*
+
+default_user_tags.administrator = true
+default_user_tags.augur = true
+default_user_tags.augurTag = true
+

scripts/docker/docker-setup-database.sh

@@ -20,6 +20,9 @@ echo "AUGUR_DB_NAME=augur" >> docker_env.txt
 echo "AUGUR_DB_PORT=5434" >> docker_env.txt
 echo "AUGUR_DB_USER=augur" >> docker_env.txt
 echo "AUGUR_DB_PASSWORD=augur" >> docker_env.txt
+echo "AUGUR_RABBITMQ_USERNAME=augur" >> .env
+echo "AUGUR_RABBITMQ_PASSWORD=password123" >> .env
+
 
 #This checks the .env file's environment variables NOT docker_env.txt.
 #AUGUR_DB_TYPE is set by the parent script in the .env file.

scripts/docker/docker-setup-external.sh

@@ -38,6 +38,9 @@ then
   echo "AUGUR_DB_HOST=$dbHostname" >> docker_env.txt
   echo "AUGUR_DB_HOST=$dbHostname" >> .env
   echo "AUGUR_DB_PORT=$dbPort" >> docker_env.txt
+  echo "AUGUR_RABBITMQ_USERNAME=augur" >> .env
+  echo "AUGUR_RABBITMQ_PASSWORD=password123" >> .env
+
 
   read -p "Plase input database name: " dbName
   #Pretty sure these stay constant among augur databases