MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try to avoid build of cryptography for docker

This commit is contained in:
Georg Krause 2021-12-13 20:31:13 +01:00
parent d007eafe3e
commit 0217b5a7a4
No known key found for this signature in database
GPG Key ID: FD479B9A4D48E632
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/Dockerfile
View File

@ -9,6 +9,7 @@ RUN \
postgresql-dev \ postgresql-dev \
python3-dev \ python3-dev \
py3-psycopg2 \ py3-psycopg2 \
py3-cryptography \
libldap \ libldap \
libffi-dev \ libffi-dev \
make \ make \
@ -23,7 +24,7 @@ RUN \
ln -s /usr/bin/python3 /usr/bin/python ln -s /usr/bin/python3 /usr/bin/python
# create virtual env for next stage # create virtual env for next stage
RUN python -m venv /venv RUN python -m venv --system-site-packages /venv
# emulate activation by prefixing PATH # emulate activation by prefixing PATH
ENV PATH="/venv/bin:$PATH" VIRTUAL_ENV=/venv ENV PATH="/venv/bin:$PATH" VIRTUAL_ENV=/venv
@ -60,6 +61,7 @@ RUN apk add --no-cache \
libpq \ libpq \
libxml2 \ libxml2 \
libxslt \ libxslt \
py3-cryptography \
&& \ && \
ln -s /usr/bin/python3 /usr/bin/python ln -s /usr/bin/python3 /usr/bin/python

2
api/requirements/base.txt
View File

@ -41,7 +41,7 @@ channels_redis~=3.3.0
uvicorn[standard]~=0.14.0 uvicorn[standard]~=0.14.0
gunicorn~=20.1.0 gunicorn~=20.1.0
cryptography~=3.4.7 cryptography=>3.3.2
# requests-http-signature==0.0.3 # requests-http-signature==0.0.3
# clone until the branch is merged and released upstream # clone until the branch is merged and released upstream
git+https://github.com/agateblue/requests-http-signature.git@signature-header-support git+https://github.com/agateblue/requests-http-signature.git@signature-header-support