From 16495c577b673f16218b64e8547b4c5d2ae490ec Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Mon, 23 Mar 2015 14:41:53 -0700
Subject: [PATCH] Revert "Use dev version of Docker"

This reverts commit d209ded13c9a7478fc47c41b2319fcf3c1935131.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 Dockerfile           | 17 ++++++-----------
 script/test-versions |  4 ++--
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1b016e9eeb..d7a6019aa8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,18 +15,13 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*
 
-# ENV ALL_DOCKER_VERSIONS 1.6.0
+ENV ALL_DOCKER_VERSIONS 1.3.3 1.4.1 1.5.0
 
-# RUN set -ex; \
-#     for v in ${ALL_DOCKER_VERSIONS}; do \
-#         curl https://get.docker.com/builds/Linux/x86_64/docker-$v -o /usr/local/bin/docker-$v; \
-#         chmod +x /usr/local/bin/docker-$v; \
-#     done
-
-# Temporarily use dev version of Docker
-ENV ALL_DOCKER_VERSIONS dev
-RUN curl https://master.dockerproject.com/linux/amd64/docker-1.5.0-dev > /usr/local/bin/docker-dev
-RUN chmod +x /usr/local/bin/docker-dev
+RUN set -ex; \
+    for v in ${ALL_DOCKER_VERSIONS}; do \
+        curl https://get.docker.com/builds/Linux/x86_64/docker-$v -o /usr/local/bin/docker-$v; \
+        chmod +x /usr/local/bin/docker-$v; \
+    done
 
 RUN useradd -d /home/user -m -s /bin/bash user
 WORKDIR /code/
diff --git a/script/test-versions b/script/test-versions
index d44cc9a7b1..a9e3bc4c7a 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -11,14 +11,14 @@ script/validate-dco
 flake8 compose
 
 if [ "$DOCKER_VERSIONS" == "" ]; then
-  DOCKER_VERSIONS="dev"
+  DOCKER_VERSIONS="1.5.0"
 elif [ "$DOCKER_VERSIONS" == "all" ]; then
   DOCKER_VERSIONS="$ALL_DOCKER_VERSIONS"
 fi
 
 for version in $DOCKER_VERSIONS; do
   >&2 echo "Running tests against Docker $version"
-  docker-$version run \
+  docker-1.5.0 run \
     --rm \
     --privileged \
     --volume="/var/lib/docker" \