Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=v1.149.1
VERSION=v1.151.0

all: build-main push-main build-e2e push-e2e

Expand Down
10 changes: 5 additions & 5 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SYNAPSE_PKG_VER="v1.149.1"
ARG SYNAPSE_PKG_VER="v1.151.0"
ARG PYTHON_PKG_VER="3.13"

# stage 1 : build pip
Expand All @@ -17,23 +17,23 @@ RUN pip wheel --no-cache-dir --wheel-dir /wheels \
git+https://gitlab.com/zerodotfive/googlesamlhandler.git@cb239e5d98bbe00465945c49661a9ca9ca134328

# stage 2 : apply workers.patch
FROM pipwheels as 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
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
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/*
Expand All @@ -42,7 +42,7 @@ COPY --from=workers_patch \
/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
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 \
Expand Down
2 changes: 1 addition & 1 deletion charts/synapse/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
name: synapse
version: 1.1.3
version: 1.2.0
4 changes: 2 additions & 2 deletions charts/synapse/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ synapse:
# this is patched version of mainstream synamse
# please find patches by link: https://github.com/code-tool/matrix-stack/tree/main/build
# also this ghcr contains synapse:v1.146.0-e2e-optimized with e2e_room_key query patches
tag: "v1.149.1"
tag: "v1.151.0"
pullPolicy: IfNotPresent
autoscaling:
enabled: true
Expand Down Expand Up @@ -549,7 +549,7 @@ matrixAuthentication:
# maxUnavailable: 1
image:
repository: ghcr.io/element-hq/matrix-authentication-service
tag: 1.14.0
tag: 1.15.0
pullPolicy: IfNotPresent
resources: {}
# limits:
Expand Down