docker: Install Python 3.4

Currently, we tox test against Python 3.4. Python 3.4 is included with
Ubuntu 14.04, which is supported for several years to come, so we want
to keep supporting it. However, Python 3.4 isn't included with Ubuntu
16.04, which is what the Docker image is based on.

We could downgrade the container to 14.04, but then we'd struggle to
get Python 3.5 into the container. Python 3.5 is the most recent in the
Python 3 series, so we should also be supporting it.

Add the apt sources for Trusty and pull in Python 3.4 from there.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Stephen Finucane <stephenfinucane@hotmail.com>

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 99a03bde1840d0d00e53f0f64ef46364759cd31a..b39204c6e0b84316f60a8a5c503500450a683656 100644 (file)
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -12,10 +12,14 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV PYTHONUNBUFFERED 1
 
 # System
+# python3.4-minimal libpython3.4-stdlib libpython3.4-minimal \
+# findutils is for python3.4... :/
+COPY tools/docker/trusty.list /etc/apt/sources.list.d/trusty.list
 RUN apt-get update -qq && \
-    apt-get install -y --no-install-recommends \
+    apt-get install -y --no-install-recommends --allow-downgrades \
     python-dev python-pip python-setuptools python-wheel \
-    python3-dev python3-pip python3-setuptools python3-wheel \
+    python3.5-dev python3-pip python3-setuptools python3-wheel \
+    python3.4-dev findutils=4.4.2-7 \
     libmysqlclient-dev mysql-client curl unzip xvfb chromium-chromedriver \
     chromium-browser build-essential && \
     ln -s /usr/lib/chromium-browser/chromedriver /usr/bin/

diff --git a/tools/docker/trusty.list b/tools/docker/trusty.list
new file mode 100644 (file)
index 0000000..8bb92c0
--- /dev/null
+++ b/tools/docker/trusty.list
@@ -0,0 +1,3 @@
+deb http://archive.ubuntu.com/ubuntu/ trusty main
+deb http://archive.ubuntu.com/ubuntu/ trusty-updates main
+deb http://security.ubuntu.com/ubuntu trusty-security main