diff --git a/Dockerfile b/Dockerfile index 5e22b46bb1..91b2334fd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM python:3.8-alpine +FROM python:3.9-alpine3.12 #Install all dependencies. -RUN apk add --no-cache postgresql-libs gettext zlib libjpeg libxml2-dev libxslt-dev +RUN apk add --no-cache postgresql-libs gettext zlib libjpeg libxml2-dev libxslt-dev py-cryptography #Print all logs without buffering it. ENV PYTHONUNBUFFERED 1 @@ -18,6 +18,7 @@ COPY requirements.txt ./ RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libressl-dev libffi-dev cargo && \ python -m venv venv && \ /opt/recipes/venv/bin/python -m pip install --upgrade pip && \ + venv/bin/pip install wheel==0.36.2 && \ venv/bin/pip install -r requirements.txt --no-cache-dir &&\ apk --purge del .build-deps diff --git a/requirements.txt b/requirements.txt index 4f05cee7ec..f53c6cec34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ -bleach==3.3.0 -bleach-allowlist==1.0.3 Django==3.1.7 +cryptography==3.4.7 django-annoying==0.10.6 django-autocomplete-light==3.8.2 django-cleanup==5.1.0 @@ -10,6 +9,8 @@ django-filter==2.4.0 django-tables2==2.3.4 djangorestframework==3.12.4 drf-writable-nested==0.6.2 +bleach==3.3.0 +bleach-allowlist==1.0.3 gunicorn==20.1.0 lxml==4.6.3 Markdown==3.3.4