diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-06-24 10:00:13 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-06-24 10:00:13 +0100 |
| commit | 5097aee740b542407e5bb13d19a3e3e6c2227316 (patch) | |
| tree | 09a03650256e09cd0b5df59dbf2d7bb2ba14df6c /docker/Dockerfile | |
| parent | changelog (diff) | |
| parent | Improve help and cmdline option names for --generate-config options (#5512) (diff) | |
| download | synapse-5097aee740b542407e5bb13d19a3e3e6c2227316.tar.xz | |
Merge branch 'develop' into rav/cleanup_metrics
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index c35da67a2a..24921eb098 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -57,6 +57,7 @@ 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 \ @@ -64,7 +65,8 @@ RUN apk add --no-cache --virtual .runtime_deps \ libxslt \ libpq \ zlib \ - su-exec + su-exec \ + xmlsec COPY --from=builder /install /usr/local COPY ./docker/start.py /start.py |