From 3c9c0ab502d1d37b5aa2a05403e1e808d66895de Mon Sep 17 00:00:00 2001 From: Hunia Fatima Date: Mon, 9 Dec 2024 17:46:43 +0500 Subject: [PATCH 1/2] chore: removed distutils from dockerfiles having python3.12 chore: removed test code --- .github/workflows/push-course-discovery-image.yaml | 1 + dockerfiles/course-discovery.Dockerfile | 3 +-- dockerfiles/edx-exams.Dockerfile | 3 +-- dockerfiles/edx-notes-api.Dockerfile | 3 +-- dockerfiles/enterprise-access.Dockerfile | 3 +-- dockerfiles/enterprise-subsidy.Dockerfile | 3 +-- dockerfiles/license-manager.Dockerfile | 3 +-- dockerfiles/portal-designer.Dockerfile | 3 +-- dockerfiles/program-intent-engagement.Dockerfile | 3 +-- dockerfiles/registrar.Dockerfile | 3 +-- 10 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/push-course-discovery-image.yaml b/.github/workflows/push-course-discovery-image.yaml index 4805065..9ecc2b4 100644 --- a/.github/workflows/push-course-discovery-image.yaml +++ b/.github/workflows/push-course-discovery-image.yaml @@ -6,6 +6,7 @@ on: branch: description: "Target branch from which the source dockerfile from image will be sourced" + schedule: - cron: "0 4 * * 1-5" # UTC Time 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/edx-notes-api.Dockerfile b/dockerfiles/edx-notes-api.Dockerfile index d2aef4f..52cace9 100644 --- a/dockerfiles/edx-notes-api.Dockerfile +++ b/dockerfiles/edx-notes-api.Dockerfile @@ -41,8 +41,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 && \ rm -rf /var/lib/apt/lists/* 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/enterprise-subsidy.Dockerfile b/dockerfiles/enterprise-subsidy.Dockerfile index cf1ac3a..4214697 100644 --- a/dockerfiles/enterprise-subsidy.Dockerfile +++ b/dockerfiles/enterprise-subsidy.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/license-manager.Dockerfile b/dockerfiles/license-manager.Dockerfile index f084ccb..7b5d24a 100644 --- a/dockerfiles/license-manager.Dockerfile +++ b/dockerfiles/license-manager.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 # Use virtualenv pypi package with Python 3.12 RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python${PYTHON_VERSION} 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} From 47b0ad23b434ac197414a3987822721074c79a86 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Mon, 9 Dec 2024 18:38:34 +0500 Subject: [PATCH 2/2] fix: remove extra line --- .github/workflows/push-course-discovery-image.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/push-course-discovery-image.yaml b/.github/workflows/push-course-discovery-image.yaml index 9ecc2b4..4805065 100644 --- a/.github/workflows/push-course-discovery-image.yaml +++ b/.github/workflows/push-course-discovery-image.yaml @@ -6,7 +6,6 @@ on: branch: description: "Target branch from which the source dockerfile from image will be sourced" - schedule: - cron: "0 4 * * 1-5" # UTC Time