From 91d7d64d9ab12b0c02999b78fec30ff41c56d380 Mon Sep 17 00:00:00 2001 From: ktyagiapphelix2u Date: Mon, 5 Jan 2026 07:23:43 +0000 Subject: [PATCH 1/5] chore: remove arbi-bom references --- .github/dependabot.yml | 5 +++-- .github/workflows/upgrade-python-requirements.yml | 8 +++++--- .../{{cookiecutter.repo_name}}/Dockerfile | 10 +--------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d0fde72a..260d5396 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,5 +5,6 @@ updates: directory: "/" schedule: interval: "weekly" - reviewers: - - "openedx/arbi-bom" + # Optional: specify reviewers to automatically request review on Dependabot PRs + # reviewers: + # - "openedx/xxx" diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index 6ccd10ca..ab9b9852 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -13,9 +13,11 @@ jobs: call-upgrade-python-requirements-workflow: with: branch: ${{ github.event.inputs.branch }} - team_reviewers: "arbi-bom" - email_address: arbi-bom@edx.org - send_success_notification: false + # optional parameters below; fill in if you'd like github or email notifications + # user_reviewers: "" + # team_reviewers: "" + # email_address: "" + # send_success_notification: false python_version: "3.12" secrets: requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }} diff --git a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile index 6274f8d4..42c8bfc5 100644 --- a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile +++ b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile @@ -1,15 +1,10 @@ -FROM ubuntu:focal AS app +FROM ubuntu:jammy AS app ARG PYTHON_VERSION=3.12 ENV TZ=UTC ENV TERM=xterm-256color ENV DEBIAN_FRONTEND=noninteractive -# software-properties-common is needed to setup our Python 3.12 env -RUN apt-get update && \ - apt-get install -y software-properties-common && \ - apt-add-repository -y ppa:deadsnakes/ppa - # Packages installed: # curl; used to install pip # gcc; for compiling python extensions distributed with python packages like mysql-client @@ -46,9 +41,6 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH" # Python is Python3 RUN ln -s /usr/bin/python3 /usr/bin/python -# Setup zoneinfo for Python 3.12 -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - # Use UTF-8 RUN locale-gen en_US.UTF-8 ENV LANG=en_US.UTF-8 From 26649bd897ddc47e50455c25fb929dae380017e6 Mon Sep 17 00:00:00 2001 From: ktyagiapphelix2u Date: Mon, 5 Jan 2026 07:30:29 +0000 Subject: [PATCH 2/5] chore: remove arbi-bom references --- cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile index 42c8bfc5..9a08e94f 100644 --- a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile +++ b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy AS app +FROM ubuntu:noble AS app ARG PYTHON_VERSION=3.12 ENV TZ=UTC From 72f6bd92b586bad337735b91f9ba3ef8281f1687 Mon Sep 17 00:00:00 2001 From: ktyagiapphelix2u Date: Mon, 5 Jan 2026 07:36:23 +0000 Subject: [PATCH 3/5] chore: remove arbi-bom references --- cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile index 9a08e94f..19da2bd7 100644 --- a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile +++ b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile @@ -16,6 +16,7 @@ ENV DEBIAN_FRONTEND=noninteractive # # If you add a package here please include a comment above describing what it is used for RUN apt-get update && apt-get -qy install --no-install-recommends \ + ca-certificates \ curl \ gcc \ language-pack-en \ From c9660bad5c96a781ef72c53e670f7c0750fdbe68 Mon Sep 17 00:00:00 2001 From: ktyagiapphelix2u Date: Mon, 5 Jan 2026 07:41:50 +0000 Subject: [PATCH 4/5] chore: remove arbi-bom references --- .../{{cookiecutter.repo_name}}/Dockerfile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile index 19da2bd7..e809995b 100644 --- a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile +++ b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile @@ -25,18 +25,15 @@ RUN apt-get update && apt-get -qy install --no-install-recommends \ locales \ pkg-config \ python${PYTHON_VERSION} \ - python${PYTHON_VERSION}-dev + python${PYTHON_VERSION}-dev \ + python3-pip # delete apt package lists because we do not need them inflating our image RUN rm -rf /var/lib/apt/lists/* -# Install pip for our version of Python -RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python${PYTHON_VERSION} - # create our Python virtual env ENV VIRTUAL_ENV=/edx/venvs/{{cookiecutter.project_name}} -RUN pip install virtualenv -RUN virtualenv -p python${PYTHON_VERSION} ${VIRTUAL_ENV} +RUN python${PYTHON_VERSION} -m venv ${VIRTUAL_ENV} ENV PATH="$VIRTUAL_ENV/bin:$PATH" # Python is Python3 From c7853b9133d3be45170de25f14e2d54089ffdd92 Mon Sep 17 00:00:00 2001 From: ktyagiapphelix2u Date: Mon, 5 Jan 2026 07:48:28 +0000 Subject: [PATCH 5/5] chore: remove arbi-bom references --- cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile index e809995b..f2aceaba 100644 --- a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile +++ b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile @@ -26,7 +26,7 @@ RUN apt-get update && apt-get -qy install --no-install-recommends \ pkg-config \ python${PYTHON_VERSION} \ python${PYTHON_VERSION}-dev \ - python3-pip + python${PYTHON_VERSION}-venv # delete apt package lists because we do not need them inflating our image RUN rm -rf /var/lib/apt/lists/*