diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..ababae31
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,15 @@
+.git/
+
+build
+dist
+*.egg-info
+*.egg/
+*.pyc
+*.swp
+
+.tox
+.coverage
+html/*
+
+# Compiled Documentation
+site/
diff --git a/Dockerfile b/Dockerfile
index 7761db74..80dceeb4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,16 @@
-FROM ubuntu:12.10
+FROM debian:wheezy
+
 MAINTAINER Joffrey F <joffrey@dotcloud.com>
-RUN apt-get update
-RUN yes | apt-get install python-pip
-ADD . /home/docker-py
-RUN cd /home/docker-py && pip install .
+
+RUN apt-get update && \
+    apt-get install -y python-pip && \
+    rm -rf /var/lib/apt/lists/* && \
+    mkdir -p /opt/src/
+
+ADD . /opt/src
+
+WORKDIR /opt/src/
+
+RUN pip install -e /opt/src
+
+CMD ["/bin/bash"]
diff --git a/docker/client.py b/docker/client.py
index 6b7c6cca..bfbb1c0e 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -276,7 +276,12 @@ class Client(requests.Session):
 
     def _stream_helper(self, response):
         """Generator for data coming from a chunked-encoded HTTP response."""
-        socket_fp = socket_obj(_sock=self._get_raw_response_socket(response))
+        if six.PY3:
+            socket_fp = self._get_raw_response_socket(response)
+        else:
+            socket_fp = socket_obj(
+                _sock=self._get_raw_response_socket(response)
+            )
         socket_fp.setblocking(1)
         socket = socket_fp.makefile()
         while True: