Merge pull request #5490 from matrix-org/rav/xmlsec_in_docker

Include xmlsec in the docker image
matrix-org · Jun 19, 2019 · ceb2fa6 · ceb2fa6
2 parents 10f9e35 + b093cfb
commit ceb2fa6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.d/5490.bugfix b/changelog.d/5490.bugfix
@@ -0,0 +1 @@
+Fix failure to start under docker with SAML support enabled.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -57,14 +57,16 @@ RUN pip install --prefix="/install" --no-warn-script-location \
 
 FROM docker.io/python:${PYTHON_VERSION}-alpine3.8
 
+# xmlsec is required for saml support
 RUN apk add --no-cache --virtual .runtime_deps \
         libffi \
         libjpeg-turbo \
         libressl \
         libxslt \
         libpq \
         zlib \
-        su-exec
+        su-exec \
+        xmlsec
 
 COPY --from=builder /install /usr/local
 COPY ./docker/start.py /start.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix failure to start under docker with SAML support enabled.