diff mbox series

[layerindex-web,5/6] Dockerfile: switch to ubuntu:jammy for >python3.8

Message ID 807be421fd3c5d5a300e2a9c59b64747bad9d820.1671208436.git.tim.orling@konsulko.com
State New
Headers show
Series [layerindex-web,1/6] Dockerfile: add captcha dependencies | expand

Commit Message

Tim Orling Dec. 16, 2022, 4:42 p.m. UTC 
From: Michael Halstead <mhalstead@linuxfoundation.org>

ubuntu:jammy provides python 3.10.6 which supports current bitbake.
Dropped unneeded python2 packages.
Moved locale generation high to reduce error messages during image building.

Signed-off-by: Michael Halstead <mhalstead@linuxfoundation.org>
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 Dockerfile | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/Dockerfile b/Dockerfile
index a6c7ad2..d8c38e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@ 
 # See README for how to use this.
 
-FROM debian:buster
+FROM ubuntu:jammy
 LABEL maintainer="Michael Halstead <mhalstead@linuxfoundation.org>"
 
 ENV PYTHONUNBUFFERED=1 \
@@ -17,30 +17,29 @@  ENV PYTHONUNBUFFERED=1 \
 
 COPY requirements.txt /
 RUN DEBIAN_FRONTEND=noninteractive apt-get update \
+    && apt-get install -y locales \
+    && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
+        && locale-gen en_US.UTF-8 \
+        && update-locale \
     && apt-get install -y --no-install-recommends \
 	autoconf \
 	g++ \
 	gcc \
 	make \
-	python-pip \
-	python-mysqldb \
-	python-dev \
-	python-pil \
-	python-wheel \
+	python2 \
 	python3-pip \
 	python3-mysqldb \
 	python3-dev \
 	python3-pil \
 	python3-wheel \
-	libz-dev \
+	zlib1g-dev \
 	libfreetype6-dev \
 	libjpeg-dev \
-	libmariadbclient-dev \
-	locales \
+	libmariadb-dev-compat \
 	netcat-openbsd \
 	curl \
 	wget \
-	git-core \
+	git \
 	vim \
 	rpm2cpio \
 	rpm \
@@ -51,7 +50,7 @@  RUN DEBIAN_FRONTEND=noninteractive apt-get update \
     && pip3 install gunicorn \
     && pip3 install setuptools \
     && pip3 install -r /requirements.txt \
-    && apt-get purge -y autoconf g++ make python3-dev libjpeg-dev libmariadbclient-dev \
+    && apt-get purge -y autoconf g++ make python3-dev libjpeg-dev \
 	&& apt-get autoremove -y \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& apt-get clean