summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristopher May-Townsend <chris@maytownsend.co.uk>2020-08-26 15:03:20 +0100
committerGitHub <noreply@github.com>2020-08-26 15:03:20 +0100
commited18f32e1b7bf734303e040400a2da2e27501154 (patch)
tree338a6845d8b4a8d2ebe9e12ec9595fbe2b31404f
parentAllow running mypy directly. (#8175) (diff)
downloadsynapse-ed18f32e1b7bf734303e040400a2da2e27501154.tar.xz
Add required Debian dependencies to allow docker builds on the arm platform (#8144)
Signed-off-by: Christopher May-Townsend <chris@maytownsend.co.uk>
-rw-r--r--changelog.d/8144.docker1
-rw-r--r--docker/Dockerfile13
2 files changed, 11 insertions, 3 deletions
diff --git a/changelog.d/8144.docker b/changelog.d/8144.docker
new file mode 100644
index 0000000000..9bb5881fa8
--- /dev/null
+++ b/changelog.d/8144.docker
@@ -0,0 +1 @@
+Fix builds of the Docker image on non-x86 platforms.
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 432d56a8ee..27512f8600 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,11 +19,16 @@ ARG PYTHON_VERSION=3.7
 FROM docker.io/python:${PYTHON_VERSION}-slim as builder
 
 # install the OS build deps
-
-
 RUN apt-get update && apt-get install -y \
     build-essential \
+    libffi-dev \
+    libjpeg-dev \
     libpq-dev \
+    libssl-dev \
+    libwebp-dev \
+    libxml++2.6-dev \
+    libxslt1-dev \
+    zlib1g-dev \
  && rm -rf /var/lib/apt/lists/*
 
 # Build dependencies that are not available as wheels, to speed up rebuilds
@@ -56,9 +61,11 @@ FROM docker.io/python:${PYTHON_VERSION}-slim
 
 RUN apt-get update && apt-get install -y \
     curl \
+    gosu \
+    libjpeg62-turbo \
     libpq5 \
+    libwebp6 \
     xmlsec1 \
-    gosu \
  && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /install /usr/local