diff options
author | Jan Christian Grünhage <jan.christian@gruenhage.xyz> | 2018-09-19 13:48:41 +0200 |
---|---|---|
committer | Jan Christian Grünhage <jan.christian@gruenhage.xyz> | 2018-09-20 14:55:11 +0200 |
commit | 8dfb33d325a7b231668973338894d08f0d5436c9 (patch) | |
tree | eeea8a36b786ebdd1a0564c5719f3035eb052571 /docker/Dockerfile | |
parent | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links (diff) | |
download | synapse-8dfb33d325a7b231668973338894d08f0d5436c9.tar.xz |
make python 3 work in the docker container
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r-- | docker/Dockerfile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 20d3fe3bd8..ad0ae0b734 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,5 @@ -FROM docker.io/python:2-alpine3.8 +ARG PYTHON_VERSION=2 +FROM docker.io/python:${PYTHON_VERSION}-alpine3.8 COPY . /synapse @@ -12,6 +13,7 @@ RUN apk add --no-cache --virtual .build_deps \ postgresql-dev \ zlib-dev \ && cd /synapse \ + && sed -i 's/\["synctl"\] + //' setup.py \ && apk add --no-cache --virtual .runtime_deps \ libffi \ libjpeg-turbo \ |