diff options
| author | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-02 18:31:29 +1000 |
|---|---|---|
| committer | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-02 18:31:29 +1000 |
| commit | 4689408a35e6ff9b7b18a5940e79d15e6b846913 (patch) | |
| tree | 4bf2c4347abb712bf7cad0040809409cc8cd6c72 /docker/Dockerfile | |
| parent | release shhs on tags (diff) | |
| parent | fix async/await consentresource (#5585) (diff) | |
| download | synapse-4689408a35e6ff9b7b18a5940e79d15e6b846913.tar.xz | |
Merge remote-tracking branch 'origin/develop' into shhs
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index c35da67a2a..0939cadf39 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,7 +11,7 @@ # docker build -f docker/Dockerfile --build-arg PYTHON_VERSION=3.6 . # -ARG PYTHON_VERSION=2 +ARG PYTHON_VERSION=3.7 ### ### Stage 0: builder @@ -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 |