From 5235ee2dd445d79ea5cacf674bacf141d64e90fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Gonz=C3=A1lez?= Date: Wed, 8 May 2024 21:07:48 -0400 Subject: [PATCH] chore: update default sandbox python version to latest 3.11 --- tutorcodejail/plugin.py | 2 +- tutorcodejail/templates/codejail/build/codejail/Dockerfile | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tutorcodejail/plugin.py b/tutorcodejail/plugin.py index 09e27ff..b36e290 100644 --- a/tutorcodejail/plugin.py +++ b/tutorcodejail/plugin.py @@ -20,7 +20,7 @@ "ENABLE_K8S_DAEMONSET": False, "ENFORCE_APPARMOR": True, "HOST": "codejailservice", - "SANDBOX_PYTHON_VERSION": "3.8.6", + "SANDBOX_PYTHON_VERSION": "3.11.9", "SKIP_INIT": False, "LIMIT_CPU": "1", "LIMIT_MEMORY": "1Gi", diff --git a/tutorcodejail/templates/codejail/build/codejail/Dockerfile b/tutorcodejail/templates/codejail/build/codejail/Dockerfile index b84642a..66d6e2b 100644 --- a/tutorcodejail/templates/codejail/build/codejail/Dockerfile +++ b/tutorcodejail/templates/codejail/build/codejail/Dockerfile @@ -21,7 +21,7 @@ RUN $PYENV_ROOT/bin/pyenv install $CODEJAILSERVICE_PYTHON_VERSION ARG SANDBOX_PYTHON_VERSION={{ CODEJAIL_SANDBOX_PYTHON_VERSION }} RUN git clone https://github.com/esinker/pyenv-version-alias $PYENV_ROOT/plugins/pyenv-alias -RUN VERSION_ALIAS={{ CODEJAIL_SANDBOX_PYTHON_VERSION }}_sandbox $PYENV_ROOT/bin/pyenv install $SANDBOX_PYTHON_VERSION +RUN VERSION_ALIAS={{ CODEJAIL_SANDBOX_PYTHON_VERSION }}_sandbox $PYENV_ROOT/bin/pyenv install -f $SANDBOX_PYTHON_VERSION RUN $PYENV_ROOT/versions/$CODEJAILSERVICE_PYTHON_VERSION/bin/python -m venv /openedx/venv RUN $PYENV_ROOT/versions/"$SANDBOX_PYTHON_VERSION"_sandbox/bin/python -m venv --copies /sandbox/venv @@ -51,9 +51,8 @@ ENV VIRTUAL_ENV /sandbox/venv/ WORKDIR /var/tmp RUN mkdir -p common/lib/ -COPY --from={{ DOCKER_IMAGE_OPENEDX }} /openedx/edx-platform/requirements/edx-sandbox/py38.txt py38.txt -COPY --from={{ DOCKER_IMAGE_OPENEDX }} /openedx/edx-platform/requirements/edx-sandbox/releases/quince.txt releases/quince.txt -RUN pip3 install -r py38.txt +COPY --from={{ DOCKER_IMAGE_OPENEDX }} /openedx/edx-platform/requirements/edx-sandbox/base.txt base.txt +RUN pip3 install -r base.txt # Allows you to add extra pip requirements to your codejail sandbox. {% if CODEJAIL_EXTRA_PIP_REQUIREMENTS is defined %}