diff --git a/Dockerfile b/Dockerfile index e1e391094f..e6755e6cf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal as app +FROM ubuntu:jammy as app ARG PYTHON_VERSION=3.12 @@ -9,15 +9,31 @@ ENV TZ=UTC RUN apt-get update && \ apt-get install -y software-properties-common && \ apt-add-repository -y ppa:deadsnakes/ppa && \ + apt-get update && \ apt-get install -qy \ curl \ gettext \ + python3.12 \ + python3.12-dev \ + python3.12-venv \ + python3-pip \ # required by bower installer git \ language-pack-en \ build-essential \ - libmysqlclient-dev \ libssl-dev \ + zlib1g-dev \ + libbz2-dev \ + libreadline-dev \ + libsqlite3-dev \ + libffi-dev \ + liblzma-dev \ + libjpeg-dev \ + libpng-dev \ + libfreetype6-dev \ + libssl-dev \ + libmysqlclient-dev \ + libcairo2-dev \ # TODO: Current version of Pillow (9.5.0) doesn't provide pre-built wheel for python 3.12, # So this apt package is needed for building Pillow on 3.12, # and can be removed when version of Pillow is upgraded to 10.5.0+ @@ -102,4 +118,4 @@ CMD while true; do python ./manage.py runserver 0.0.0.0:8381; sleep 2; done # Define k8s target FROM prod as kubernetes ENV DISCOVERY_SETTINGS='kubernetes' -ENV DJANGO_SETTINGS_MODULE="course_discovery.settings.$DISCOVERY_SETTINGS" +ENV DJANGO_SETTINGS_MODULE="course_discovery.settings.$DISCOVERY_SETTINGS" \ No newline at end of file diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 83dac76104..2ec9ec6184 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -44,7 +44,7 @@ pillow < 10.0.0 # Awaiting fix https://github.com/Benoss/django-elasticsearch-debug-toolbar/pull/21 to be merged django-debug-toolbar < 4.2.0 -# selenium==4.13.0 causing test failures +# selenium==4.13.0 causing test failure selenium==4.12.0 # Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.