diff options
| author | Erik Johnston <erik@matrix.org> | 2021-03-26 12:26:58 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-03-26 12:26:58 +0000 |
| commit | 019010964de1e97dc14788f980af7f0943b9168c (patch) | |
| tree | 54a7121169aa821adc4fce1cbc14f0bf8047289b /docker | |
| parent | Preserve host in example apache config (#9696) (diff) | |
| parent | Update cahngelog (diff) | |
| download | synapse-019010964de1e97dc14788f980af7f0943b9168c.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 7cd4dd7d1e..a442b34598 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,17 +25,18 @@ LABEL org.opencontainers.image.licenses='Apache-2.0' # install the OS build deps RUN apt-get update && apt-get install -y \ - build-essential \ - libffi-dev \ - libjpeg-dev \ - libpq-dev \ - libssl-dev \ - libwebp-dev \ - libxml++2.6-dev \ - libxslt1-dev \ - rustc \ - zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* + build-essential \ + libffi-dev \ + libjpeg-dev \ + libpq-dev \ + libssl-dev \ + libwebp-dev \ + libxml++2.6-dev \ + libxslt1-dev \ + openssl \ + rustc \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* # Build dependencies that are not available as wheels, to speed up rebuilds RUN pip install --prefix="/install" --no-warn-script-location \ @@ -68,14 +69,16 @@ RUN pip install --prefix="/install" --no-warn-script-location \ FROM docker.io/python:${PYTHON_VERSION}-slim RUN apt-get update && apt-get install -y \ - curl \ - gosu \ - libjpeg62-turbo \ - libpq5 \ - libwebp6 \ - xmlsec1 \ - libjemalloc2 \ - && rm -rf /var/lib/apt/lists/* + curl \ + gosu \ + libjpeg62-turbo \ + libpq5 \ + libwebp6 \ + xmlsec1 \ + libjemalloc2 \ + libssl-dev \ + openssl \ + && rm -rf /var/lib/apt/lists/* COPY --from=builder /install /usr/local COPY ./docker/start.py /start.py @@ -88,4 +91,4 @@ EXPOSE 8008/tcp 8009/tcp 8448/tcp ENTRYPOINT ["/start.py"] HEALTHCHECK --interval=1m --timeout=5s \ - CMD curl -fSs http://localhost:8008/health || exit 1 + CMD curl -fSs http://localhost:8008/health || exit 1 |