summary refs log tree commit diff
path: root/docker/complement
diff options
context:
space:
mode:
authorAndrew Ferrazzutti <andrewf@element.io>2025-03-25 09:57:55 -0400
committerGitHub <noreply@github.com>2025-03-25 13:57:55 +0000
commit92a29dcffc4fca0029c2f3ee63a66152c5e54e60 (patch)
treea4920e9e771b855e346b4752669501e6680349cd /docker/complement
parentMerge branch 'master' into develop (diff)
downloadsynapse-92a29dcffc4fca0029c2f3ee63a66152c5e54e60.tar.xz
Docker: Use an ARG for debian version more often (#18272)
Diffstat (limited to 'docker/complement')
-rw-r--r--docker/complement/Dockerfile7
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/complement/Dockerfile b/docker/complement/Dockerfile

index ce82c400eb..3e7f808cc5 100644 --- a/docker/complement/Dockerfile +++ b/docker/complement/Dockerfile
@@ -9,6 +9,9 @@ ARG SYNAPSE_VERSION=latest # This is an intermediate image, to be built locally (not pulled from a registry). ARG FROM=matrixdotorg/synapse-workers:$SYNAPSE_VERSION +ARG DEBIAN_VERSION=bookworm + +FROM docker.io/library/postgres:13-${DEBIAN_VERSION} AS postgres_base FROM $FROM # First of all, we copy postgres server from the official postgres image, @@ -20,8 +23,8 @@ FROM $FROM # the same debian version as Synapse's docker image (so the versions of the # shared libraries match). RUN adduser --system --uid 999 postgres --home /var/lib/postgresql -COPY --from=docker.io/library/postgres:13-bookworm /usr/lib/postgresql /usr/lib/postgresql -COPY --from=docker.io/library/postgres:13-bookworm /usr/share/postgresql /usr/share/postgresql +COPY --from=postgres_base /usr/lib/postgresql /usr/lib/postgresql +COPY --from=postgres_base /usr/share/postgresql /usr/share/postgresql RUN mkdir /var/run/postgresql && chown postgres /var/run/postgresql ENV PATH="${PATH}:/usr/lib/postgresql/13/bin" ENV PGDATA=/var/lib/postgresql/data