From 1d989ad08a3d07344931639356ef7ba7b00f4d3d Mon Sep 17 00:00:00 2001 From: Hunia Fatima Date: Mon, 9 Dec 2024 18:40:02 +0500 Subject: [PATCH] chore: removed distutils package from dockerfiles (#72) * chore: removed distutils from dockerfiles having python3.12 chore: removed test code * fix: remove extra line --------- Co-authored-by: Usama Sadiq --- dockerfiles/course-discovery.Dockerfile | 3 +-- dockerfiles/edx-exams.Dockerfile | 3 +-- dockerfiles/enterprise-access.Dockerfile | 3 +-- dockerfiles/portal-designer.Dockerfile | 3 +-- dockerfiles/program-intent-engagement.Dockerfile | 3 +-- dockerfiles/registrar.Dockerfile | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dockerfiles/course-discovery.Dockerfile b/dockerfiles/course-discovery.Dockerfile index 4f7d83a..dfa8857 100644 --- a/dockerfiles/course-discovery.Dockerfile +++ b/dockerfiles/course-discovery.Dockerfile @@ -27,8 +27,7 @@ RUN apt-get update && \ libcairo2-dev \ python3-pip \ python${PYTHON_VERSION} \ - python${PYTHON_VERSION}-dev \ - python${PYTHON_VERSION}-distutils && \ + python${PYTHON_VERSION}-dev && \ rm -rf /var/lib/apt/lists/* # Use UTF-8. diff --git a/dockerfiles/edx-exams.Dockerfile b/dockerfiles/edx-exams.Dockerfile index 574d69c..7e97db2 100644 --- a/dockerfiles/edx-exams.Dockerfile +++ b/dockerfiles/edx-exams.Dockerfile @@ -49,8 +49,7 @@ RUN apt-get update && apt-get -qy install --no-install-recommends \ curl \ python3-pip \ python${PYTHON_VERSION} \ - python${PYTHON_VERSION}-dev \ - python${PYTHON_VERSION}-distutils + python${PYTHON_VERSION}-dev RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/dockerfiles/enterprise-access.Dockerfile b/dockerfiles/enterprise-access.Dockerfile index f7e5e7b..7e7b951 100644 --- a/dockerfiles/enterprise-access.Dockerfile +++ b/dockerfiles/enterprise-access.Dockerfile @@ -53,8 +53,7 @@ RUN apt-get update && apt-get -qy install --no-install-recommends \ libsqlite3-dev \ python3-pip \ python${PYTHON_VERSION} \ - python${PYTHON_VERSION}-dev \ - python${PYTHON_VERSION}-distutils + python${PYTHON_VERSION}-dev RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/dockerfiles/portal-designer.Dockerfile b/dockerfiles/portal-designer.Dockerfile index 0ba5c45..24f1aae 100644 --- a/dockerfiles/portal-designer.Dockerfile +++ b/dockerfiles/portal-designer.Dockerfile @@ -28,8 +28,7 @@ RUN apt-get update && apt-get -qy install --no-install-recommends \ curl \ python3-pip \ python${PYTHON_VERSION} \ - python${PYTHON_VERSION}-dev \ - python${PYTHON_VERSION}-distutils + python${PYTHON_VERSION}-dev RUN pip install --upgrade pip setuptools # delete apt package lists because we do not need them inflating our image diff --git a/dockerfiles/program-intent-engagement.Dockerfile b/dockerfiles/program-intent-engagement.Dockerfile index 217684d..c4da02e 100644 --- a/dockerfiles/program-intent-engagement.Dockerfile +++ b/dockerfiles/program-intent-engagement.Dockerfile @@ -48,8 +48,7 @@ RUN apt-get update && apt-get -qy install --no-install-recommends \ curl \ python3-pip \ python${PYTHON_VERSION} \ - python${PYTHON_VERSION}-dev \ - python${PYTHON_VERSION}-distutils + python${PYTHON_VERSION}-dev # need to use virtualenv pypi package with Python 3.12 diff --git a/dockerfiles/registrar.Dockerfile b/dockerfiles/registrar.Dockerfile index 56bb02f..ebfaf31 100644 --- a/dockerfiles/registrar.Dockerfile +++ b/dockerfiles/registrar.Dockerfile @@ -26,8 +26,7 @@ RUN apt-get install -qy \ curl \ python3-pip \ python${PYTHON_VERSION} \ - python${PYTHON_VERSION}-dev \ - python${PYTHON_VERSION}-distutils + python${PYTHON_VERSION}-dev # need to use virtualenv pypi package with Python 3.12 RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python${PYTHON_VERSION}