From 7b00fe567a359e69ec6a0173383d3c6d7ff7aeb2 Mon Sep 17 00:00:00 2001
From: Guilhem Lettron <guilhem@lettron.fr>
Date: Fri, 8 Jan 2016 17:16:29 +0100
Subject: [PATCH 1/2] Differentiate rabbitmq version and package version

---
 Dockerfile                    | 5 +++--
 generate-stackbrew-library.sh | 3 ---
 update.sh                     | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 01f48bc8..a7547a11 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,11 +29,12 @@ ENV RABBITMQ_LOGS=- RABBITMQ_SASL_LOGS=-
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys F78372A06FF50C80464FC1B4F7B8CEA6056E8E56
 RUN echo 'deb http://www.rabbitmq.com/debian testing main' > /etc/apt/sources.list.d/rabbitmq.list
 
-ENV RABBITMQ_VERSION 3.6.0-1
+ENV RABBITMQ_VERSION 3.6.0
+ENV RABBITMQ_DEBIAN_VERSION 3.6.0-1
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
 		erlang erlang-mnesia erlang-public-key erlang-crypto erlang-ssl erlang-asn1 erlang-inets erlang-os-mon erlang-xmerl erlang-eldap \
-		rabbitmq-server=$RABBITMQ_VERSION \
+		rabbitmq-server=$RABBITMQ_DEBIAN_VERSION \
 	&& rm -rf /var/lib/apt/lists/*
 
 # /usr/sbin/rabbitmq-server has some irritating behavior, and only exists to "su - rabbitmq /usr/lib/rabbitmq/bin/rabbitmq-server ..."
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 66f8a6fc..b9c480c5 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -10,9 +10,6 @@ echo '# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)'
 commit="$(git log -1 --format='format:%H' -- Dockerfile $(awk 'toupper($1) == "COPY" { for (i = 2; i < NF; i++) { print $i } }' Dockerfile))"
 fullVersion="$(grep -m1 'ENV RABBITMQ_VERSION ' Dockerfile | cut -d' ' -f3)"
 
-# fullVersion is a Debian version and we only care about the RabbitMQ version, so let's trim -*
-fullVersion="${fullVersion%%-*}"
-
 versionAliases=()
 while [ "${fullVersion%.*}" != "$fullVersion" ]; do
 	versionAliases+=( $fullVersion )
diff --git a/update.sh b/update.sh
index 678b7582..4edce382 100755
--- a/update.sh
+++ b/update.sh
@@ -3,10 +3,10 @@ set -e
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
-fullVersion="$(curl -sSL 'http://www.rabbitmq.com/debian/dists/testing/main/binary-amd64/Packages' | grep -m1 -A10 '^Package: rabbitmq-server$' | grep -m1 '^Version: ' | cut -d' ' -f2)"
+debianVersion="$(curl -sSL 'http://www.rabbitmq.com/debian/dists/testing/main/binary-amd64/Packages' | grep -m1 -A10 '^Package: rabbitmq-server$' | grep -m1 '^Version: ' | cut -d' ' -f2)"
 
-# fullVersion is a Debian version and we only care about the RabbitMQ version for tags, so let's trim -*
-tagVersion="${fullVersion%%-*}"
+rabbitmqVersion="${debianVersion%%-*}"
 
 set -x
-sed -ri 's/^(ENV RABBITMQ_VERSION) .*/\1 '"$fullVersion"'/' Dockerfile
+sed -ri 's/^(ENV RABBITMQ_VERSION) .*/\1 '"$rabbitmqVersion"'/' Dockerfile
+sed -ri 's/^(ENV RABBITMQ_DEBIAN_VERSION) .*/\1 '"$debianVersion"'/' Dockerfile

From f9b15d74ffafa31e028d9218aebfc9b3eac45e40 Mon Sep 17 00:00:00 2001
From: Guilhem Lettron <guilhem@lettron.fr>
Date: Fri, 8 Jan 2016 17:35:49 +0100
Subject: [PATCH 2/2] Add a symlink /plugins for easy plugins install

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index a7547a11..992e3d23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,6 +47,8 @@ VOLUME /var/lib/rabbitmq
 # add a symlink to the .erlang.cookie in /root so we can "docker exec rabbitmqctl ..." without gosu
 RUN ln -sf /var/lib/rabbitmq/.erlang.cookie /root/
 
+RUN ln -sf /usr/lib/rabbitmq/lib/rabbitmq_server-$RABBITMQ_VERSION/plugins /plugins
+
 COPY docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]