Fixed socket for py3

* Fixed broken Dockerfile
* added .dockerignore
This commit is contained in:
micahhausler 2014-10-27 16:46:47 -04:00
parent b93fca639e
commit 1476ad302d
3 changed files with 36 additions and 6 deletions

15
.dockerignore Normal file
View File

@ -0,0 +1,15 @@
.git/
build
dist
*.egg-info
*.egg/
*.pyc
*.swp
.tox
.coverage
html/*
# Compiled Documentation
site/

View File

@ -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"]

View File

@ -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: