summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-14 17:44:46 +0100
committerNeil Johnson <neil@matrix.org>2018-08-14 17:44:46 +0100
commit19b433e3f42d29bbc22ccf919b5dbdb0e88e5fdc (patch)
tree6b3fc312c783390b2d984ddf30310a996ddd276e /docker
parentremove blank line (diff)
parentMerge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re... (diff)
downloadsynapse-19b433e3f42d29bbc22ccf919b5dbdb0e88e5fdc.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 26fb3a6bff..777976217d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/python:2-alpine3.7
+FROM docker.io/python:2-alpine3.8
 
 RUN apk add --no-cache --virtual .nacl_deps \
         build-base \