From db48a4cb52b9567389851256b3fe85662277a588 Mon Sep 17 00:00:00 2001
From: Stefan Scherer <scherer_stefan@icloud.com>
Date: Sun, 19 Apr 2015 23:05:35 +0200
Subject: [PATCH] fix for raspbian build

---
 Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 96ff57d028c..3f337f829fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,14 +15,13 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*
 
-ENV ALL_DOCKER_VERSIONS 1.6.0-rc4
+ENV ALL_DOCKER_VERSIONS 1.6.0
 
 RUN set -ex; \
-    curl https://test.docker.com/builds/Linux/x86_64/docker-1.6.0-rc4 -o /usr/local/bin/docker-1.6.0-rc4; \
-    chmod +x /usr/local/bin/docker-1.6.0-rc4
-
-# Set the default Docker to be run
-RUN ln -s /usr/local/bin/docker-1.6.0-rc4 /usr/local/bin/docker
+    curl -L http://assets.hypriot.com/docker-hypriot_1.6.0-1_armhf.deb -o docker-hypriot_1.6.0-1_armhf.deb; \
+    dpkg -x docker-hypriot_1.6.0-1_armhf.deb /tmp/docker || true; \
+    mv /tmp/docker/usr/bin/docker /usr/local/bin/docker; \
+    rm -rf /tmp/docker
 
 RUN useradd -d /home/user -m -s /bin/bash user
 WORKDIR /code/
@@ -34,11 +33,12 @@ ADD requirements-dev.txt /code/
 RUN pip install -r requirements-dev.txt
 
 RUN apt-get install -qy wget && \
+    cd /tmp && \
     wget -q https://pypi.python.org/packages/source/P/PyInstaller/PyInstaller-2.1.tar.gz && \
     tar xzf PyInstaller-2.1.tar.gz && \
     cd PyInstaller-2.1/bootloader && \
     python ./waf configure --no-lsb build install && \
-    ln -s /code/PyInstaller-2.1/PyInstaller/bootloader/Linux-32bit-arm /usr/local/lib/python2.7/dist-packages/PyInstaller/bootloader/Linux-32bit-arm
+    ln -s /tmp/PyInstaller-2.1/PyInstaller/bootloader/Linux-32bit-arm /usr/local/lib/python2.7/dist-packages/PyInstaller/bootloader/Linux-32bit-arm
 
 ADD . /code/
 RUN python setup.py install