Merge branch 'beta' into develop
This commit is contained in:
commit
a811d4a55c
@ -1,7 +1,7 @@
|
|||||||
FROM python:3.8-alpine
|
FROM python:3.9-alpine3.12
|
||||||
|
|
||||||
#Install all dependencies.
|
#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.
|
#Print all logs without buffering it.
|
||||||
ENV PYTHONUNBUFFERED 1
|
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 && \
|
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 && \
|
python -m venv venv && \
|
||||||
/opt/recipes/venv/bin/python -m pip install --upgrade pip && \
|
/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 &&\
|
venv/bin/pip install -r requirements.txt --no-cache-dir &&\
|
||||||
apk --purge del .build-deps
|
apk --purge del .build-deps
|
||||||
|
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
bleach==3.3.0
|
|
||||||
bleach-allowlist==1.0.3
|
|
||||||
Django==3.1.7
|
Django==3.1.7
|
||||||
|
cryptography==3.4.7
|
||||||
django-annoying==0.10.6
|
django-annoying==0.10.6
|
||||||
django-autocomplete-light==3.8.2
|
django-autocomplete-light==3.8.2
|
||||||
django-cleanup==5.1.0
|
django-cleanup==5.1.0
|
||||||
@ -10,6 +9,8 @@ django-filter==2.4.0
|
|||||||
django-tables2==2.3.4
|
django-tables2==2.3.4
|
||||||
djangorestframework==3.12.4
|
djangorestframework==3.12.4
|
||||||
drf-writable-nested==0.6.2
|
drf-writable-nested==0.6.2
|
||||||
|
bleach==3.3.0
|
||||||
|
bleach-allowlist==1.0.3
|
||||||
gunicorn==20.1.0
|
gunicorn==20.1.0
|
||||||
lxml==4.6.3
|
lxml==4.6.3
|
||||||
Markdown==3.3.4
|
Markdown==3.3.4
|
||||||
|
Loading…
Reference in New Issue
Block a user