Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal as app
FROM ubuntu:jammy as app

ARG PYTHON_VERSION=3.12

Expand All @@ -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+
Expand Down Expand Up @@ -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"
2 changes: 1 addition & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading