Makefile+patches

Author: shcherbak

Makefile

@@ -0,0 +1,15 @@
+VERSION=v1.142.1
+
+all: build-main push-main build-e2e push-e2e
+
+build-main:
+	DOCKER_BUILDKIT=1 docker build -t ghcr.io/code-tool/matrix-stack/synapse:${VERSION} --build-arg SYNAPSE_PKG_VER=${VERSION} --target main -f build/Dockerfile build
+
+push-main: build-main
+	docker push ghcr.io/code-tool/matrix-stack/synapse:${VERSION}
+
+build-e2e:
+	DOCKER_BUILDKIT=1 docker build -t ghcr.io/code-tool/matrix-stack/synapse:${VERSION}-e2e-optimized --build-arg SYNAPSE_PKG_VER=${VERSION} --target e2e -f build/Dockerfile build
+
+push-e2e: build-e2e
+	docker push ghcr.io/code-tool/matrix-stack/synapse:${VERSION}-e2e-optimized

build/Dockerfile

@@ -0,0 +1,49 @@
+ARG SYNAPSE_PKG_VER="v1.142.1"
+ARG PYTHON_PKG_VER="3.13"
+
+# stage 1 : build pip
+FROM matrixdotorg/synapse:${SYNAPSE_PKG_VER} AS pipwheels
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+      git \
+      build-essential \
+      patch \
+      libpq-dev\
+  && rm -rf /var/cache/apt/*
+WORKDIR /wheels
+RUN pip install psycopg2
+RUN pip wheel --no-cache-dir --wheel-dir /wheels \
+      git+https://github.com/matrix-org/synapse-s3-storage-provider.git@2dbba1020fe6fb84d79f1a23c925e508d9ba15e1 \
+      git+https://gitlab.com/zerodotfive/googlesamlhandler.git@cb239e5d98bbe00465945c49661a9ca9ca134328
+
+# stage 2 : apply workers.patch
+FROM pipwheels as workers_patch
+ARG PYTHON_PKG_VER
+COPY workers.patch /tmp/workers.patch
+RUN patch $(ls /usr/local/lib/python$PYTHON_PKG_VER/site-packages/synapse/config/workers.py) \
+    < /tmp/workers.patch \
+    && rm /tmp/workers.patch
+
+# stage 3 : apply e2e_room_keys.patch
+FROM pipwheels as e2e_patch
+ARG PYTHON_PKG_VER
+COPY e2e_room_keys.patch /tmp/e2e_room_keys.patch
+RUN patch $(ls /usr/local/lib/python${PYTHON_PKG_VER}/site-packages/synapse/storage/databases/main/e2e_room_keys.py) \
+    < /tmp/e2e_room_keys.patch \
+    && rm /tmp/e2e_room_keys.patch
+
+# stage 4 : base version with workers names
+FROM matrixdotorg/synapse:$SYNAPSE_PKG_VER as main
+ARG PYTHON_PKG_VER
+RUN --mount=type=bind,from=pipwheels,source=/wheels,target=/wheels \
+    pip install --no-cache-dir /wheels/*
+COPY --from=workers_patch \
+  /usr/local/lib/python${PYTHON_PKG_VER}/site-packages/synapse/config/workers.py \
+  /usr/local/lib/python${PYTHON_PKG_VER}/site-packages/synapse/config/workers.py
+
+# stage 5 : base version with e2e_room_keys table optimization
+FROM main as e2e
+ARG PYTHON_PKG_VER
+COPY --from=e2e_patch \
+  /usr/local/lib/python${PYTHON_PKG_VER}/site-packages/synapse/storage/databases/main/e2e_room_keys.py \
+  /usr/local/lib/python${PYTHON_PKG_VER}/site-packages/synapse/storage/databases/main/e2e_room_keys.py

build/e2e_room_keys.patch

@@ -0,0 +1,22 @@
+--- a/synapse/storage/databases/main/e2e_room_keys.py
++++ b/synapse/storage/databases/main/e2e_room_keys.py
+@@ -400,13 +400,16 @@ class EndToEndRoomKeyStore(EndToEndRoomKeyBackgroundStore):
+             # it doesn't exist.
+             return 0
+
+-        return await self.db_pool.simple_select_one_onecol(
+-            table="e2e_room_keys",
++        row = await self.db_pool.simple_select_one_onecol(
++            table="e2e_room_keys_counts",
+             keyvalues={"user_id": user_id, "version": version_int},
+-            retcol="COUNT(*)",
++            retcol="cnt",
+             desc="count_e2e_room_keys",
++            allow_none=True,
+         )
+
++        return row or 0
++
+     @trace
+     async def delete_e2e_room_keys(
+         self,

build/workers.patch

@@ -0,0 +1,14 @@
+--- workers.py	2023-08-30 15:13:45.131604043 +0300
++++ workers.py	2023-08-30 15:19:35.119581079 +0300
+@@ -225,7 +225,10 @@
+         # The shared secret used for authentication when connecting to the main synapse.
+         self.worker_replication_secret = config.get("worker_replication_secret", None)
+ 
+-        self.worker_name = config.get("worker_name", self.worker_app)
++        from os import environ
++        self.worker_name = self.worker_app
++        if self.worker_app:
++             self.worker_name = config.get("worker_name", environ.get("HOSTNAME"))
+         self.instance_name = self.worker_name or MAIN_PROCESS_INSTANCE_NAME
+ 
+         # FIXME: Remove this check after a suitable amount of time.