From 8fb7f5a95ccaf2dee8d6ab7a64f82d2fc1c5ee7f Mon Sep 17 00:00:00 2001
From: Gary White Jr <7660110+GaryPWhite@users.noreply.github.com>
Date: Thu, 15 Feb 2024 09:59:30 -0500
Subject: [PATCH 1/2] add rabbitmq docker configuration
Signed-off-by: Gary White Jr <7660110+GaryPWhite@users.noreply.github.com>
---
README.md | 1 +
docker-compose-externalDB.yml | 12 ++++++++++++
docker-compose.yml | 12 ++++++++++++
docker/rabbitmq/Dockerfile | 12 ++++++++++++
docker/rabbitmq/augur.conf | 12 ++++++++++++
5 files changed, 49 insertions(+)
create mode 100644 docker/rabbitmq/Dockerfile
create mode 100644 docker/rabbitmq/augur.conf
diff --git a/README.md b/README.md
index 3b4d7f4ddc..c49199f35f 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,7 @@ Contributors
- `Dawn Foster `_
- `Ivana Atanasova `_
- `Georg J.P. Link `_
+- `Gary P White `_
GSoC 2022 participants
-----------------------
diff --git a/docker-compose-externalDB.yml b/docker-compose-externalDB.yml
index 0d04cbad16..2fb4016d60 100644
--- a/docker-compose-externalDB.yml
+++ b/docker-compose-externalDB.yml
@@ -6,6 +6,17 @@ services:
ports:
- 6379:6379
+ rabbitmq:
+ image: augur-rabbitmq
+ build:
+ context: ./docker/rabbitmq/
+ dockerfile: ./docker/rabbitmq/
+ # ports for amqp connections / management api
+ ports:
+ - 5671:5671
+ - 5672:5672
+ - 15671:15671
+ - 15672:15672
augur:
image: augurlabs/augur-new:latest
@@ -27,6 +38,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:password123@rabbitmq:5672/augur_vhost
depends_on:
- redis
diff --git a/docker-compose.yml b/docker-compose.yml
index 75ad63ea7f..4abea682be 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,16 @@ services:
ports:
- 6379:6379
+ rabbitmq:
+ image: augur-rabbitmq
+ build:
+ context: ./docker/rabbitmq/
+ # ports for amqp connections / management api
+ ports:
+ - 5671:5671
+ - 5672:5672
+ - 15671:15671
+ - 15672:15672
augur:
image: augur-new:latest
@@ -40,9 +50,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:password123@rabbitmq:5672/augur_vhost
depends_on:
- augur-db
- redis
+ - rabbitmq
volumes:
facade:
diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile
new file mode 100644
index 0000000000..06a13a24f9
--- /dev/null
+++ b/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 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
diff --git a/docker/rabbitmq/augur.conf b/docker/rabbitmq/augur.conf
new file mode 100644
index 0000000000..93c036426f
--- /dev/null
+++ b/docker/rabbitmq/augur.conf
@@ -0,0 +1,12 @@
+default_vhost = augur_vhost
+default_user = augur
+default_pass = password123
+
+default_permissions.configure = .*
+default_permissions.read = .*
+default_permissions.write = .*
+
+default_user_tags.administrator = true
+default_user_tags.augur = true
+default_user_tags.augurTag = true
+
From ef12fcba5156f612cb0c83e38cc656ef5dbd71f9 Mon Sep 17 00:00:00 2001
From: Gary White Jr <7660110+GaryPWhite@users.noreply.github.com>
Date: Thu, 15 Feb 2024 15:14:17 -0500
Subject: [PATCH 2/2] added default environment variables
Signed-off-by: Gary White Jr <7660110+GaryPWhite@users.noreply.github.com>
---
Makefile | 9 ++++++++-
docker-compose-externalDB.yml | 17 ++++++++++-------
docker-compose.yml | 16 ++++++++++------
docker/rabbitmq/Dockerfile | 2 +-
docker/rabbitmq/augur.conf | 2 --
scripts/docker/docker-setup-database.sh | 3 +++
scripts/docker/docker-setup-external.sh | 3 +++
7 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/Makefile b/Makefile
index 26cac178b5..b69f688226 100644
--- a/Makefile
+++ b/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
\ No newline at end of file
diff --git a/docker-compose-externalDB.yml b/docker-compose-externalDB.yml
index 2fb4016d60..dedcf1089e 100644
--- a/docker-compose-externalDB.yml
+++ b/docker-compose-externalDB.yml
@@ -9,14 +9,17 @@ services:
rabbitmq:
image: augur-rabbitmq
build:
- context: ./docker/rabbitmq/
- dockerfile: ./docker/rabbitmq/
+ context: .
+ dockerfile: ./docker/rabbitmq/Dockerfile
# ports for amqp connections / management api
ports:
- - 5671:5671
- - 5672:5672
- - 15671:15671
- - 15672:15672
+ - 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
@@ -38,7 +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:password123@rabbitmq:5672/augur_vhost
+ - RABBITMQ_CONN_STRING=amqp://${AUGUR_RABBITMQ_USERNAME:-augur}:${AUGUR_RABBITMQ_PASSWORD:-password123}@rabbitmq:5672/augur_vhost
depends_on:
- redis
diff --git a/docker-compose.yml b/docker-compose.yml
index 4abea682be..2d86a52046 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,13 +22,17 @@ services:
rabbitmq:
image: augur-rabbitmq
build:
- context: ./docker/rabbitmq/
+ context: .
+ dockerfile: ./docker/rabbitmq/Dockerfile
# ports for amqp connections / management api
ports:
- - 5671:5671
- - 5672:5672
- - 15671:15671
- - 15672:15672
+ - 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
@@ -50,7 +54,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:password123@rabbitmq:5672/augur_vhost
+ - RABBITMQ_CONN_STRING=amqp://${AUGUR_RABBITMQ_USERNAME:-augur}:${AUGUR_RABBITMQ_PASSWORD:-password123}@rabbitmq:5672/augur_vhost
depends_on:
- augur-db
- redis
diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile
index 06a13a24f9..cef51f28be 100644
--- a/docker/rabbitmq/Dockerfile
+++ b/docker/rabbitmq/Dockerfile
@@ -3,7 +3,7 @@ FROM rabbitmq:3.12-management-alpine
LABEL maintainer="574/augur@simplelogin.com"
LABEL version="0.62.0"
-COPY --chown=rabbitmq:rabbitmq augur.conf /etc/rabbitmq/conf.d/
+COPY --chown=rabbitmq:rabbitmq ./docker/rabbitmq/augur.conf /etc/rabbitmq/conf.d/
RUN chmod 777 /etc/rabbitmq/conf.d/augur.conf
diff --git a/docker/rabbitmq/augur.conf b/docker/rabbitmq/augur.conf
index 93c036426f..d4de989deb 100644
--- a/docker/rabbitmq/augur.conf
+++ b/docker/rabbitmq/augur.conf
@@ -1,6 +1,4 @@
default_vhost = augur_vhost
-default_user = augur
-default_pass = password123
default_permissions.configure = .*
default_permissions.read = .*
diff --git a/scripts/docker/docker-setup-database.sh b/scripts/docker/docker-setup-database.sh
index a3eed32638..62c7aaf176 100755
--- a/scripts/docker/docker-setup-database.sh
+++ b/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.
diff --git a/scripts/docker/docker-setup-external.sh b/scripts/docker/docker-setup-external.sh
index db6c910c6f..8454382f75 100755
--- a/scripts/docker/docker-setup-external.sh
+++ b/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