diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
commit | 303f1c851fc363d3fc4fc4c91328abd89863341d (patch) | |
tree | e8d8c1ba55141f3eae7aa8ea74a509e3dac42e28 /Dockerfile | |
parent | fix known broken test (diff) | |
parent | Merge pull request #3543 from bebehei/docker (diff) | |
download | synapse-303f1c851fc363d3fc4fc4c91328abd89863341d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_in_log_in_limits
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 565341fee3..0242be5f68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,32 @@ FROM docker.io/python:2-alpine3.7 -RUN apk add --no-cache --virtual .nacl_deps su-exec build-base libffi-dev zlib-dev libressl-dev libjpeg-turbo-dev linux-headers postgresql-dev libxslt-dev +RUN apk add --no-cache --virtual .nacl_deps \ + build-base \ + libffi-dev \ + libjpeg-turbo-dev \ + libressl-dev \ + libxslt-dev \ + linux-headers \ + postgresql-dev \ + su-exec \ + zlib-dev COPY . /synapse # A wheel cache may be provided in ./cache for faster build RUN cd /synapse \ - && pip install --upgrade pip setuptools psycopg2 lxml \ + && pip install --upgrade \ + lxml \ + pip \ + psycopg2 \ + setuptools \ && mkdir -p /synapse/cache \ && pip install -f /synapse/cache --upgrade --process-dependency-links . \ && mv /synapse/contrib/docker/start.py /synapse/contrib/docker/conf / \ - && rm -rf setup.py setup.cfg synapse + && rm -rf \ + setup.cfg \ + setup.py \ + synapse VOLUME ["/data"] |