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..f2aceaba 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:noble 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 @@ -21,6 +16,7 @@ RUN apt-get update && \ # # 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 \ @@ -29,26 +25,20 @@ 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 \ + python${PYTHON_VERSION}-venv # 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 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