Skip to content

Commit

Permalink
fix for raspbian build
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanScherer committed Apr 19, 2015
1 parent 101dcae commit db48a4c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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
Expand Down

0 comments on commit db48a4c

Please sign in to comment.