aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2018-01-17 14:56:36 +0100
committerMax <msuraev@sysmocom.de>2018-01-17 14:56:36 +0100
commita28b789022032b4aece18136abbfe36a5d209e7f (patch)
treed9fff8dd9b4239b5c8da28ae10a0196df4ce2b2d /docker
parent595ea2df169b252fb44e2322bf307aa08002c041 (diff)
Install pip tool into containers
The pip(2|3) tool is the officially recommended tool to deal with Python packages [1] with much greater flexibility compared to invoking setup.py directly. As a preparation step for using it to install osmo-python-tests let's add it to container images. [1] https://packaging.python.org/guides/tool-recommendations/ Change-Id: If2702c71cd268ca688e9ecc264f8cd1257c27899
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile.deb8_amd642
-rw-r--r--docker/Dockerfile.deb8_i3862
-rw-r--r--docker/Dockerfile_osmocom_jenkins.amd642
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/Dockerfile.deb8_amd64 b/docker/Dockerfile.deb8_amd64
index 4d9966f..f32a3c3 100644
--- a/docker/Dockerfile.deb8_amd64
+++ b/docker/Dockerfile.deb8_amd64
@@ -32,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gc
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf stow
# for osmo-python-tests
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip
# Linux kernel
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc
diff --git a/docker/Dockerfile.deb8_i386 b/docker/Dockerfile.deb8_i386
index 4d8498c..c9b3aa9 100644
--- a/docker/Dockerfile.deb8_i386
+++ b/docker/Dockerfile.deb8_i386
@@ -32,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libortp-dev libpcsclite-de
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi
# for osmo-python-tests
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip
# Linux kernel
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc
diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64
index 547790c..12154b3 100644
--- a/docker/Dockerfile_osmocom_jenkins.amd64
+++ b/docker/Dockerfile_osmocom_jenkins.amd64
@@ -32,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gc
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf
# for osmo-python-tests
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip
# Linux kernel
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc