summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2019-12-06 15:59:34 +0100
committerOliver Smith <osmith@sysmocom.de>2019-12-06 16:01:01 +0100
commit9e69cb84d45c8103f664cf7ad0bfcc9eed90e84d (patch)
tree18a8835d0a0cda4d56568f43ea85589accf201f7
parent9097082be5f335cc5e15e7c30b352d1b9a9d0b1c (diff)
Revert "docker: drop python2"
This reverts commit 9097082be5f335cc5e15e7c30b352d1b9a9d0b1c. I was under the impression, that all previous scripts in osmo-python-tests were already working with python 3. But as it turns out, this isn't true. Reverting, so I can properly post follow-up patches, that fix the issues before we apply this "drop python2" patch again. Related: OS#2819 Change-Id: I68e99ed3fb2eba86eaccec7a3cab75658e9543b1
-rw-r--r--docker/Dockerfile_osmocom_jenkins.amd645
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64
index 63b6e74..2209fc6 100644
--- a/docker/Dockerfile_osmocom_jenkins.amd64
+++ b/docker/Dockerfile_osmocom_jenkins.amd64
@@ -85,6 +85,7 @@ RUN \
osc \
patchelf \
pkg-config \
+ python \
python3 \
python3-gi \
python3-mako \
@@ -94,6 +95,10 @@ RUN \
python3-setuptools \
python3-usb \
python3-yaml \
+ python-minimal \
+ python-pip \
+ python-pychart \
+ python-setuptools \
rsync \
sdcc \
sqlite3 \