Skip to content

Commit 0690a47

Browse files
authored
v1.151.0 (#22)
* v1.151.0 * FromAsCasing: 'as' and 'FROM' keywords' casing do not match
1 parent 8a7a54b commit 0690a47

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=v1.149.1
1+
VERSION=v1.151.0
22

33
.PHONY: all build-main push-main build-e2e push-e2e test-lua
44

build/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG SYNAPSE_PKG_VER="v1.149.1"
1+
ARG SYNAPSE_PKG_VER="v1.151.0"
22
ARG PYTHON_PKG_VER="3.13"
33

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

1919
# stage 2 : apply workers.patch
20-
FROM pipwheels as workers_patch
20+
FROM pipwheels AS workers_patch
2121
ARG PYTHON_PKG_VER
2222
COPY workers.patch /tmp/workers.patch
2323
RUN patch $(ls /usr/local/lib/python$PYTHON_PKG_VER/site-packages/synapse/config/workers.py) \
2424
< /tmp/workers.patch \
2525
&& rm /tmp/workers.patch
2626

2727
# stage 3 : apply e2e_room_keys.patch
28-
FROM pipwheels as e2e_patch
28+
FROM pipwheels AS e2e_patch
2929
ARG PYTHON_PKG_VER
3030
COPY e2e_room_keys.patch /tmp/e2e_room_keys.patch
3131
RUN patch $(ls /usr/local/lib/python${PYTHON_PKG_VER}/site-packages/synapse/storage/databases/main/e2e_room_keys.py) \
3232
< /tmp/e2e_room_keys.patch \
3333
&& rm /tmp/e2e_room_keys.patch
3434

3535
# stage 4 : base version with workers names
36-
FROM matrixdotorg/synapse:$SYNAPSE_PKG_VER as main
36+
FROM matrixdotorg/synapse:$SYNAPSE_PKG_VER AS main
3737
ARG PYTHON_PKG_VER
3838
RUN --mount=type=bind,from=pipwheels,source=/wheels,target=/wheels \
3939
pip install --no-cache-dir /wheels/*
@@ -42,7 +42,7 @@ COPY --from=workers_patch \
4242
/usr/local/lib/python${PYTHON_PKG_VER}/site-packages/synapse/config/workers.py
4343

4444
# stage 5 : base version with e2e_room_keys table optimization
45-
FROM main as e2e
45+
FROM main AS e2e
4646
ARG PYTHON_PKG_VER
4747
COPY --from=e2e_patch \
4848
/usr/local/lib/python${PYTHON_PKG_VER}/site-packages/synapse/storage/databases/main/e2e_room_keys.py \

charts/synapse/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
apiVersion: v2
33
name: synapse
44
description: matrix synapse kubernetes deployment
5-
version: 2.1.6
6-
appVersion: 1.149.1
5+
version: 2.2.0
6+
appVersion: 1.151.0

charts/synapse/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ synapse:
7676
# this is patched version of mainstream synamse
7777
# please find patches by link: https://github.com/code-tool/matrix-stack/tree/main/build
7878
# also this ghcr contains synapse:v1.146.0-e2e-optimized with e2e_room_key query patches
79-
tag: "v1.149.1"
79+
tag: "v1.151.0"
8080
pullPolicy: IfNotPresent
8181
disablePgBouncerForStreamWriters: false
8282
nodeSelector: {}
@@ -700,7 +700,7 @@ matrixAuthentication:
700700
# maxUnavailable: 1
701701
image:
702702
repository: ghcr.io/element-hq/matrix-authentication-service
703-
tag: 1.14.0
703+
tag: 1.15.0
704704
pullPolicy: IfNotPresent
705705
resources: {}
706706
# limits:

0 commit comments

Comments
 (0)