From 2da03f471179ed1780b7056a8838a17a018e71ce Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Thu, 25 Jun 2020 15:57:38 -0700 Subject: [PATCH] Dockerfile: debian 10 "buster" and drop python2 Debian 10 "buster" actually has Django 2.2 available python2 is now EOL, so drop all usage Signed-off-by: Tim Orling Signed-off-by: Paul Eggleton --- Dockerfile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0de9bdb..8c4c847 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # See README for how to use this. -FROM debian:stretch +FROM debian:buster LABEL maintainer="Michael Halstead " ENV PYTHONUNBUFFERED=1 \ @@ -21,10 +21,9 @@ RUN apt-get update \ g++ \ gcc \ make \ - python-pip \ - python-mysqldb \ - python-dev \ - python-imaging \ + python3-pip \ + python3-mysqldb \ + python3-dev \ python3-pip \ python3-mysqldb \ python3-dev \ @@ -44,11 +43,9 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && update-locale \ && pip3 install gunicorn \ - && pip install setuptools \ && pip3 install setuptools \ - && pip install -r /requirements.txt \ && pip3 install -r /requirements.txt \ - && apt-get purge -y autoconf g++ make python-dev python3-dev libjpeg-dev libmariadbclient-dev \ + && apt-get purge -y autoconf g++ make python3-dev libjpeg-dev libmariadbclient-dev \ && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* \ && apt-get clean