chore: removed distutils package from dockerfiles

edx · Dec 9, 2024 · c469f71 · c469f71
1 parent 89b2766
commit c469f71
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 16 deletions.
diff --git a/.github/workflows/push-course-discovery-image.yaml b/.github/workflows/push-course-discovery-image.yaml
@@ -5,6 +5,9 @@ on:
     inputs:
       branch:
         description: "Target branch from which the source dockerfile from image will be sourced"
+  pull_request:
+    branches:
+      - '**'
 
   schedule:
     - cron: "0 4 * * 1-5"  # UTC Time

diff --git a/.github/workflows/push-edx-exams-image.yaml b/.github/workflows/push-edx-exams-image.yaml
@@ -9,6 +9,10 @@ on:
   schedule:
     - cron: "0 4 * * 1-5"  # UTC Time
 
+  pull_request:
+    branches:
+      - '**'
+
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/push-edx-notes-api-image.yaml b/.github/workflows/push-edx-notes-api-image.yaml
@@ -9,6 +9,10 @@ on:
   schedule:
     - cron: "0 4 * * 1-5"  # UTC Time
 
+  pull_request:
+    branches:
+      - '**'
+
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/push-enterprise-access-image.yaml b/.github/workflows/push-enterprise-access-image.yaml
@@ -9,6 +9,10 @@ on:
   schedule:
     - cron: "0 4 * * 1-5"  # UTC Time
 
+  pull_request:
+    branches:
+      - '**'
+
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/push-enterprise-subsidy-image.yaml b/.github/workflows/push-enterprise-subsidy-image.yaml
@@ -9,6 +9,10 @@ on:
   schedule:
     - cron: "0 4 * * 1-5"  # UTC Time
 
+  pull_request:
+    branches:
+      - '**'
+
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/push-license-manager-image.yaml b/.github/workflows/push-license-manager-image.yaml
@@ -6,6 +6,10 @@ on:
       branch:
         description: "Target branch from which the source dockerfile from image will be sourced"
 
+  pull_request:
+    branches:
+      - '**'
+
   schedule:
     - cron: "0 4 * * 1-5"  # UTC Time
 

diff --git a/.github/workflows/push-program-intent-engagement-image.yaml b/.github/workflows/push-program-intent-engagement-image.yaml
@@ -9,6 +9,10 @@ on:
   schedule:
     - cron: "0 4 * * 1-5"  # UTC Time
 
+  pull_request:
+    branches:
+      - '**'
+
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/push-registrar-image.yaml b/.github/workflows/push-registrar-image.yaml
@@ -6,6 +6,10 @@ on:
       branch:
         description: "Target branch from which the source dockerfile from image will be sourced"
 
+  pull_request:
+    branches:
+      - '**'
+
   schedule:
     - cron: "0 4 * * 1-5"  # UTC Time
 

diff --git a/dockerfiles/course-discovery.Dockerfile b/dockerfiles/course-discovery.Dockerfile
@@ -28,7 +28,6 @@ RUN apt-get update && \
   python3-pip \
   python${PYTHON_VERSION} \
   python${PYTHON_VERSION}-dev \
-  python${PYTHON_VERSION}-distutils && \
   rm -rf /var/lib/apt/lists/*
 
 # Use UTF-8.

diff --git 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
@@ -42,7 +42,6 @@ RUN apt-get update && apt-get -qy install --no-install-recommends \
     python3-pip \
     python${PYTHON_VERSION} \
     python${PYTHON_VERSION}-dev \
-    python${PYTHON_VERSION}-distutils && \
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}