[layerindexweb,6/7] Dockerfile: debian 10 "buster" and drop python2

Submitted by Elliot, Amber N on June 25, 2020, 10:57 p.m. | Patch ID: 173925

Details

Message ID 20200625225739.32402-7-amber.n.elliot@intel.com
State New
Headers show

Commit Message

Elliot, Amber N June 25, 2020, 10:57 p.m.
From: Tim Orling <ticotimo@gmail.com>

Debian 10 "buster" actually has Django 2.2 available
python2 is now EOL, so drop all usage

Signed-off-by: Tim Orling <ticotimo@gmail.com>
---
 Dockerfile | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

Patch hide | download patch | download mbox

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 <mhalstead@linuxfoundation.org>"
 
 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