bump docker to 1.9.1 and compose to 1.5.2

Author: fermayo

Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER [email protected]
 RUN apt-get update && \
 	DEBIAN_FRONTEND=noninteractive apt-get install -yq iptables apt-transport-https ca-certificates ssh git curl make
 
-ENV DIND_COMMIT=b8bed8832b77a478360ae946a69dab5e922b194e DOCKER_VERSION=1.8.3 COMPOSE_VERSION=1.3.3
+ENV DIND_COMMIT=b8bed8832b77a478360ae946a69dab5e922b194e DOCKER_VERSION=1.9.1 COMPOSE_VERSION=1.5.2
 ADD https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION} /usr/bin/docker
 ADD https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind /usr/local/bin/dind
 ADD https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-linux-x86_64 /usr/local/bin/docker-compose

build.sh

@@ -209,7 +209,7 @@ cat <<EOF
 Build summary
 =============
 
-$DOCKER_USED
+$DOCKER_USED and docker-compose ${COMPOSE_VERSION}
 $SOURCE
 $BUILD
 $TEST

run.sh

@@ -56,19 +56,19 @@ if [ -S /var/run/docker.sock ]; then
 	if ! docker version > /dev/null 2>&1 ; then
 		export DOCKER_VERSION=$(cat version_list | grep -P "^$(docker version 2>&1 > /dev/null | grep -iF "client and server don't have same version" | grep -oP 'server: *\d*\.\d*' | grep -oP '\d*\.\d*') .*$" | cut -d " " -f2)
 		if [ "${DOCKER_VERSION}" != "" ]; then
-			print_msg "=> Downloading Docker ${DOCKER_VERSION}"
+			print_msg "=> Downloading docker ${DOCKER_VERSION}"
 			curl -o /usr/bin/docker https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}
 		fi
 	fi
 	docker version > /dev/null 2>&1 || { print_msg "   Failed to connect to docker daemon at /var/run/docker.sock" && exit 1; }
 	EXTERNAL_DOCKER=yes
-	DOCKER_USED="Using external docker version ${DOCKER_VERSION} mounted at /var/run/docker.sock"
+	DOCKER_USED="Using external docker ${DOCKER_VERSION} mounted at /var/run/docker.sock"
     export DOCKER_USED=${DOCKER_USED}
     export EXTERNAL_DOCKER=${EXTERNAL_DOCKER}
     export MOUNTED_DOCKER_FOLDER=${MOUNTED_DOCKER_FOLDER}
     /build.sh "$@"
 else
-	DOCKER_USED="Using docker-in-docker"
+	DOCKER_USED="Using docker-in-docker ${DOCKER_VERSION}"
 	if [ "$(ls -A /var/lib/docker)" ]; then
 		print_msg "=> Detected pre-existing /var/lib/docker folder"
 		MOUNTED_DOCKER_FOLDER=yes