Skip to content
Snippets Groups Projects
Unverified Commit ceb2fa60 authored by Richard van der Hoff's avatar Richard van der Hoff Committed by GitHub
Browse files

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

Include xmlsec in the docker image
parents 10f9e35b b093cfb0
No related branches found
No related tags found
No related merge requests found
Fix failure to start under docker with SAML support enabled.
\ No newline at end of file
...@@ -57,6 +57,7 @@ RUN pip install --prefix="/install" --no-warn-script-location \ ...@@ -57,6 +57,7 @@ RUN pip install --prefix="/install" --no-warn-script-location \
FROM docker.io/python:${PYTHON_VERSION}-alpine3.8 FROM docker.io/python:${PYTHON_VERSION}-alpine3.8
# xmlsec is required for saml support
RUN apk add --no-cache --virtual .runtime_deps \ RUN apk add --no-cache --virtual .runtime_deps \
libffi \ libffi \
libjpeg-turbo \ libjpeg-turbo \
...@@ -64,7 +65,8 @@ RUN apk add --no-cache --virtual .runtime_deps \ ...@@ -64,7 +65,8 @@ RUN apk add --no-cache --virtual .runtime_deps \
libxslt \ libxslt \
libpq \ libpq \
zlib \ zlib \
su-exec su-exec \
xmlsec
COPY --from=builder /install /usr/local COPY --from=builder /install /usr/local
COPY ./docker/start.py /start.py COPY ./docker/start.py /start.py
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment