diff options
| author | Stephen Finucane <stephen@that.guru> | 2019-09-03 14:35:15 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephen@that.guru> | 2019-09-08 15:41:03 +0100 |
| commit | 6267a5fad01db859c1b31561124f00a5b97299f4 (patch) | |
| tree | ad264c80412fc46cd16b3c626ca61e28966134cb /tools/docker | |
| parent | 1a36ed51a8e1e073dad6dc14b683ef68d44f98fa (diff) | |
| download | patchwork-6267a5fad01db859c1b31561124f00a5b97299f4.tar patchwork-6267a5fad01db859c1b31561124f00a5b97299f4.tar.gz | |
Drop support for Python 3.4, add Python 3.7
It's no longer supported upstream and the *second* last Ubuntu LTS
release provides something newer. Time to move on.
Signed-off-by: Stephen Finucane <stephen@that.guru>
Diffstat (limited to 'tools/docker')
| -rw-r--r-- | tools/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | tools/docker/trusty-ports.list | 3 | ||||
| -rw-r--r-- | tools/docker/trusty.list | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 76bb6b2..8170071 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -17,14 +17,13 @@ ENV PYTHONUNBUFFERED 1 # System -# trusty and findutils is for python3.4; xenial is for python3.5 +# xenial is for python3.5 # TODO(stephenfin): Are curl, unzip required? COPY tools/docker/*.list /etc/apt/sources.list.d/ RUN cd /etc/apt/sources.list.d; \ echo $(uname -m) > /tmp/arch; \ if [ $(cat /tmp/arch) != 'x86_64' ] && grep -q -v "i.86" /tmp/arch; then \ - mv trusty-ports.list trusty.list; \ mv xenial-ports.list xenial.list; \ else \ rm *-ports.list; \ @@ -34,7 +33,7 @@ RUN apt-get update -qq && \ apt-get install -y --no-install-recommends --allow-downgrades \ python-dev python-pip python-setuptools python-wheel \ python3.5-dev python3-pip python3-setuptools python3-wheel \ - python3.4-dev findutils=4.4.2-7 python3.6-dev \ + python3.6-dev \ libmysqlclient-dev mysql-client curl unzip build-essential \ git postgresql-client tzdata libpq-dev diff --git a/tools/docker/trusty-ports.list b/tools/docker/trusty-ports.list deleted file mode 100644 index ebcf4fa..0000000 --- a/tools/docker/trusty-ports.list +++ /dev/null @@ -1,3 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ trusty main -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main diff --git a/tools/docker/trusty.list b/tools/docker/trusty.list deleted file mode 100644 index 8bb92c0..0000000 --- a/tools/docker/trusty.list +++ /dev/null @@ -1,3 +0,0 @@ -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 |