diff options
Diffstat (limited to 'cluster/prod/app/matrix/build')
| -rw-r--r-- | cluster/prod/app/matrix/build/docker-compose.yml | 2 | ||||
| -rw-r--r-- | cluster/prod/app/matrix/build/matrix-synapse/Dockerfile | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/cluster/prod/app/matrix/build/docker-compose.yml b/cluster/prod/app/matrix/build/docker-compose.yml index 3b70b64..b61fb39 100644 --- a/cluster/prod/app/matrix/build/docker-compose.yml +++ b/cluster/prod/app/matrix/build/docker-compose.yml @@ -20,4 +20,4 @@ services: # otherwise synapse may fail to launch due to incompatibility issues # see this issue for an example: https://github.com/matrix-org/synapse-s3-storage-provider/issues/64 S3_VERSION: 2c46a764f700e6439afa11c00db827ddf21a9e89 - image: particallydone/amd64_synapse:v59 + image: particallydone/amd64_synapse:v60 diff --git a/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile b/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile index 5a6f709..aa0c165 100644 --- a/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile +++ b/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile @@ -1,4 +1,4 @@ -FROM amd64/debian:trixie as builder +FROM amd64/debian:trixie AS builder ARG VERSION ARG S3_VERSION @@ -31,13 +31,16 @@ RUN virtualenv /root/matrix-env -p /usr/bin/python3 && \ pip3 install \ git+https://github.com/matrix-org/synapse-s3-storage-provider.git@${S3_VERSION} -FROM amd64/debian:bookworm +# WARNING: trixie n'est pas une LTS +# mais on est obligé d'avoir la même version que le builder +# et le builder veut une version de rustc qui n'est pas dans bookworm (dernière LTS at the time of writing) +FROM amd64/debian:trixie RUN apt-get update && \ apt-get -qq -y full-upgrade && \ apt-get install -y \ python3 \ - python3-distutils \ + python3-setuptools \ libffi8 \ libjpeg62-turbo \ libssl3 \ |