Skip to content

Commit

Permalink
Dockerfile.*: Make sure we have a requests module version that works …
Browse files Browse the repository at this point in the history
…with dockerpy

Ref.:
docker/docker-py#1321

Signed-off-by: Andrei Gherzan <[email protected]>
  • Loading branch information
Andrei Gherzan authored and michal-mazurek committed Jan 3, 2017
1 parent 463683d commit a8b31a1
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 5 deletions.
7 changes: 6 additions & 1 deletion Dockerfile.beaglebone-black
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
FROM resin/beaglebone-debian:jessie

# Install the resinhup dependencies
RUN apt-get update && apt-get install vim btrfs-tools mtools dosfstools python3 python3-pip python3-urllib3 python3-sh python3-parted python3-binaryornot jq -y && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install wget vim btrfs-tools mtools dosfstools python3 python3-urllib3 python3-sh python3-parted python3-binaryornot jq -y && rm -rf /var/lib/apt/lists/*

# Install pip manually otherwise we will get a broken dependency of docker-py: requests-2.12.2
# https://github.com/docker/docker-py/issues/1321
RUN wget https://bootstrap.pypa.io/get-pip.py
RUN python3 get-pip.py
RUN pip3 install docker-py

# Use the host's kmod - this one supports compressed kernel modules
Expand Down
7 changes: 6 additions & 1 deletion Dockerfile.intel-nuc
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
FROM resin/nuc-debian:jessie

# Install the resinhup dependencies
RUN apt-get update && apt-get install vim btrfs-tools mtools dosfstools python3 python3-pip python3-urllib3 python3-sh python3-parted python3-binaryornot jq -y && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install wget vim btrfs-tools mtools dosfstools python3 python3-urllib3 python3-sh python3-parted python3-binaryornot jq -y && rm -rf /var/lib/apt/lists/*

# Install pip manually otherwise we will get a broken dependency of docker-py: requests-2.12.2
# https://github.com/docker/docker-py/issues/1321
RUN wget https://bootstrap.pypa.io/get-pip.py
RUN python3 get-pip.py
RUN pip3 install docker-py

# Use the host's kmod - this one supports compressed kernel modules
Expand Down
7 changes: 6 additions & 1 deletion Dockerfile.raspberry-pi
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
FROM resin/rpi-raspbian:jessie

# Install the resinhup dependencies
RUN apt-get update && apt-get install vim btrfs-tools mtools dosfstools python3 python3-pip python3-urllib3 python3-sh python3-parted python3-binaryornot jq -y && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install wget vim btrfs-tools mtools dosfstools python3 python3-urllib3 python3-sh python3-parted python3-binaryornot jq -y && rm -rf /var/lib/apt/lists/*

# Install pip manually otherwise we will get a broken dependency of docker-py: requests-2.12.2
# https://github.com/docker/docker-py/issues/1321
RUN wget https://bootstrap.pypa.io/get-pip.py
RUN python3 get-pip.py
RUN pip3 install docker-py

# Use the host's kmod - this one supports compressed kernel modules
Expand Down
7 changes: 6 additions & 1 deletion Dockerfile.raspberry-pi2
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
FROM resin/rpi-raspbian:jessie

# Install the resinhup dependencies
RUN apt-get update && apt-get install vim btrfs-tools mtools dosfstools python3 python3-pip python3-urllib3 python3-sh python3-parted python3-binaryornot jq -y && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install wget vim btrfs-tools mtools dosfstools python3 python3-urllib3 python3-sh python3-parted python3-binaryornot jq -y && rm -rf /var/lib/apt/lists/*

# Install pip manually otherwise we will get a broken dependency of docker-py: requests-2.12.2
# https://github.com/docker/docker-py/issues/1321
RUN wget https://bootstrap.pypa.io/get-pip.py
RUN python3 get-pip.py
RUN pip3 install docker-py

# Use the host's kmod - this one supports compressed kernel modules
Expand Down
7 changes: 6 additions & 1 deletion Dockerfile.raspberrypi3
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
FROM resin/raspberrypi3-debian:jessie

# Install the resinhup dependencies
RUN apt-get update && apt-get install vim btrfs-tools mtools dosfstools python3 python3-pip python3-urllib3 python3-sh python3-parted python3-binaryornot jq -y && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install wget vim btrfs-tools mtools dosfstools python3 python3-urllib3 python3-sh python3-parted python3-binaryornot jq -y && rm -rf /var/lib/apt/lists/*

# Install pip manually otherwise we will get a broken dependency of docker-py: requests-2.12.2
# https://github.com/docker/docker-py/issues/1321
RUN wget https://bootstrap.pypa.io/get-pip.py
RUN python3 get-pip.py
RUN pip3 install docker-py

# Use the host's kmod - this one supports compressed kernel modules
Expand Down

0 comments on commit a8b31a1

Please sign in to comment.