summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Christian Grünhage <jan.christian@gruenhage.xyz>2018-08-14 11:43:59 +0200
committerGitHub <noreply@github.com>2018-08-14 11:43:59 +0200
commit8f0c430ca4be1dcd18e85c58d0572e3deb4c6556 (patch)
treee220fd3cd73b94dee155ed3063a21255081dd264
parentName changelog after PR, not bug (diff)
parentupdate docker base-image to alpine 3.8 (diff)
downloadsynapse-8f0c430ca4be1dcd18e85c58d0572e3deb4c6556.tar.xz
Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-base
update docker base-image to alpine 3.8
-rw-r--r--changelog.d/3669.misc1
-rw-r--r--docker/Dockerfile2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/3669.misc b/changelog.d/3669.misc
new file mode 100644
index 0000000000..fc579ddc60
--- /dev/null
+++ b/changelog.d/3669.misc
@@ -0,0 +1 @@
+Update docker base image from alpine 3.7 to 3.8.
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 \