From f56b227fda8ee59d3bca084a2de71f7bbdf47ecb Mon Sep 17 00:00:00 2001
From: Brandon Myers <bmyers@mozilla.com>
Date: Thu, 14 Feb 2019 11:34:21 -0600
Subject: [PATCH] Update rabbitmq version to 3.7

---
 docker/compose/rabbitmq/Dockerfile                 |  8 +++++---
 docker/compose/rabbitmq/files/erlang.repo          | 10 ++++++++++
 docker/compose/rabbitmq/files/rabbitmq-server.repo | 10 ++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 docker/compose/rabbitmq/files/erlang.repo
 create mode 100644 docker/compose/rabbitmq/files/rabbitmq-server.repo

diff --git a/docker/compose/rabbitmq/Dockerfile b/docker/compose/rabbitmq/Dockerfile
index 32cdf26a..a5f91f62 100644
--- a/docker/compose/rabbitmq/Dockerfile
+++ b/docker/compose/rabbitmq/Dockerfile
@@ -2,12 +2,14 @@ FROM centos:7
 
 LABEL maintainer="mozdef@mozilla.com"
 
-ENV RABBITMQ_VERSION 3.3.5
+ENV RABBITMQ_VERSION 3.7.13
+
+COPY docker/compose/rabbitmq/files/rabbitmq-server.repo /etc/yum.repos.d/rabbitmq-server.repo
+COPY docker/compose/rabbitmq/files/erlang.repo /etc/yum.repos.d/erlang.repo
 
 RUN \
-  yum makecache fast && \
+  yum -q makecache -y fast && \
   yum install -y epel-release && \
-  rpm --import https://www.rabbitmq.com/rabbitmq-release-signing-key.asc && \
   yum install -y rabbitmq-server-$RABBITMQ_VERSION && \
   yum clean all
 
diff --git a/docker/compose/rabbitmq/files/erlang.repo b/docker/compose/rabbitmq/files/erlang.repo
new file mode 100644
index 00000000..e52fc6eb
--- /dev/null
+++ b/docker/compose/rabbitmq/files/erlang.repo
@@ -0,0 +1,10 @@
+[rabbitmq_erlang]
+name=rabbitmq_erlang
+baseurl=https://packagecloud.io/rabbitmq/erlang/el/7/$basearch
+repo_gpgcheck=1
+gpgcheck=0
+enabled=1
+gpgkey=https://packagecloud.io/rabbitmq/erlang/gpgkey
+sslverify=1
+sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+metadata_expire=300
diff --git a/docker/compose/rabbitmq/files/rabbitmq-server.repo b/docker/compose/rabbitmq/files/rabbitmq-server.repo
new file mode 100644
index 00000000..7cce7a36
--- /dev/null
+++ b/docker/compose/rabbitmq/files/rabbitmq-server.repo
@@ -0,0 +1,10 @@
+[rabbitmq-server]
+name=rabbitmq-server
+baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/7/$basearch
+repo_gpgcheck=1
+gpgcheck=0
+enabled=1
+gpgkey=https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey
+sslverify=1
+sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+metadata_expire=300