Merge pull request #57 from guilhem/debianVersion

Differentiate rabbitmq version and package version

Author: yosifkit

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 ..."

generate-stackbrew-library.sh

@@ -10,9 +10,6 @@ echo '# maintainer: InfoSiftr <[email protected]> (@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 )

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