summary refs log tree commit diff
path: root/docker/Dockerfile
diff options
context:
space:
mode:
authorBruno Windels <brunow@matrix.org>2018-09-27 19:18:38 +0100
committerBruno Windels <brunow@matrix.org>2018-09-27 19:18:38 +0100
commitc5e1de677d137f0effe24a82c3c1846d60e72a9f (patch)
tree65d232f95219430c735d4864533515c354669702 /docker/Dockerfile
parentadd changelog (diff)
parentMerge pull request #3794 from matrix-org/erikj/faster_typing (diff)
downloadsynapse-github/bwindels/registerasregularuser.tar.xz
Merge branch 'develop' into bwindels/registerasregularuser github/bwindels/registerasregularuser bwindels/registerasregularuser
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile

index 20d3fe3bd8..1d00defc2d 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