From a8b31a1bee0024674f9146568dea67ba1d4e0c29 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Fri, 9 Dec 2016 14:57:01 +0100 Subject: [PATCH] Dockerfile.*: Make sure we have a requests module version that works with dockerpy Ref.: https://github.com/docker/docker-py/issues/1321 Signed-off-by: Andrei Gherzan --- Dockerfile.beaglebone-black | 7 ++++++- Dockerfile.intel-nuc | 7 ++++++- Dockerfile.raspberry-pi | 7 ++++++- Dockerfile.raspberry-pi2 | 7 ++++++- Dockerfile.raspberrypi3 | 7 ++++++- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Dockerfile.beaglebone-black b/Dockerfile.beaglebone-black index 5b067193..fcad96f2 100644 --- a/Dockerfile.beaglebone-black +++ b/Dockerfile.beaglebone-black @@ -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 diff --git a/Dockerfile.intel-nuc b/Dockerfile.intel-nuc index c2c96e6f..bb0e7e1e 100644 --- a/Dockerfile.intel-nuc +++ b/Dockerfile.intel-nuc @@ -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 diff --git a/Dockerfile.raspberry-pi b/Dockerfile.raspberry-pi index 45c5eccd..502c09f0 100644 --- a/Dockerfile.raspberry-pi +++ b/Dockerfile.raspberry-pi @@ -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 diff --git a/Dockerfile.raspberry-pi2 b/Dockerfile.raspberry-pi2 index 45c5eccd..502c09f0 100644 --- a/Dockerfile.raspberry-pi2 +++ b/Dockerfile.raspberry-pi2 @@ -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 diff --git a/Dockerfile.raspberrypi3 b/Dockerfile.raspberrypi3 index 2d73f496..d47c9935 100644 --- a/Dockerfile.raspberrypi3 +++ b/Dockerfile.raspberrypi3 @@ -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