diff options
| author | Max <msuraev@sysmocom.de> | 2018-01-10 11:07:14 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2018-01-12 14:03:40 +0000 |
| commit | fbcc11b4736d3b8d9ebda5eb27fa36067d1d6baf (patch) | |
| tree | a5b67b52fe66e3caa27d82528653a44a85ecc1c0 /docker | |
| parent | 66b46cd9b95c6eaa5559378e0457d6ead1a916a4 (diff) | |
Install setuptools in docker images
Make sure that python-setuptools are installed for both python v2 and v3
to make sure osmo-python-tests can be installed.
Change-Id: I3ecd96af2e2c0c7d141977639103d71e46c0cdc5
Related: OS#2821
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.deb8_amd64 | 3 | ||||
| -rw-r--r-- | docker/Dockerfile.deb8_i386 | 3 | ||||
| -rw-r--r-- | docker/Dockerfile_osmocom_jenkins.amd64 | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/docker/Dockerfile.deb8_amd64 b/docker/Dockerfile.deb8_amd64 index 9b6a939..3fdcd6a 100644 --- a/docker/Dockerfile.deb8_amd64 +++ b/docker/Dockerfile.deb8_amd64 @@ -31,5 +31,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gc # building 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 + # Linux kernel RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc diff --git a/docker/Dockerfile.deb8_i386 b/docker/Dockerfile.deb8_i386 index 51962f6..9beb188 100644 --- a/docker/Dockerfile.deb8_i386 +++ b/docker/Dockerfile.deb8_i386 @@ -31,5 +31,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libortp-dev libpcsclite-de # OsmocomBB 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 + # 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 10c49c3..063199b 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -31,6 +31,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gc # building 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 + # Linux kernel RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc |