diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-19 11:33:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-19 11:33:06 +0100 |
| commit | ceb2fa60a5b25f74235a2ea4f7c371f8ccfa3f63 (patch) | |
| tree | de92b97891af07ade76b4f9a8eb715ec5da4bac1 | |
| parent | Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typo (diff) | |
| parent | changelog (diff) | |
| download | synapse-ceb2fa60a5b25f74235a2ea4f7c371f8ccfa3f63.tar.xz | |
Merge pull request #5490 from matrix-org/rav/xmlsec_in_docker
Include xmlsec in the docker image
| -rw-r--r-- | changelog.d/5490.bugfix | 1 | ||||
| -rw-r--r-- | docker/Dockerfile | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changelog.d/5490.bugfix b/changelog.d/5490.bugfix new file mode 100644 index 0000000000..4242254c53 --- /dev/null +++ b/changelog.d/5490.bugfix @@ -0,0 +1 @@ +Fix failure to start under docker with SAML support enabled. \ No newline at end of file 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 |