From 117e2a9df85ee1e2b3e71634fb515946e1b151df Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 6 Sep 2022 10:24:23 +0200 Subject: [PATCH 01/42] push to version 1.66.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f5dce69..6852307 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.16 AS builder -ENV VERSION=v1.65.0 +ENV VERSION=v1.66.0 RUN apk add --no-cache \ alpine-sdk \ From 9cce9e2b696688170a5552b620af81ffad814e7a Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 27 Sep 2022 17:24:08 +0200 Subject: [PATCH 02/42] push to 1.68.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6852307..9d0e63e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.16 AS builder -ENV VERSION=v1.66.0 +ENV VERSION=v1.68.0 RUN apk add --no-cache \ alpine-sdk \ From 0156b7414911bcd60745691d5a04b3d363a82fd5 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:43:04 +0000 Subject: [PATCH 03/42] Delete '.gitlab-ci.yml' --- .gitlab-ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 32ac534..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,18 +0,0 @@ -variables: - CONTAINER_NAME: thallian/matrix-synapse - -build: - stage: build - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - script: - - mkdir -p /kaniko/.docker - - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - - >- - /kaniko/executor - --context "$CI_PROJECT_DIR" - --dockerfile "$CI_PROJECT_DIR/Dockerfile" - --destination "$CONTAINER_NAME:$CI_COMMIT_SHA" - --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME" - --destination "$CONTAINER_NAME:latest" From 5850caebfa77edb31152d71cf0c4e7d60f496c9d Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:43:42 +0000 Subject: [PATCH 04/42] Add '.woodpecker.yml' --- .woodpecker.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..c92c5fb --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,11 @@ +pipeline: + publish-docker-image: + image: plugins/kaniko + settings: + repo: docker.io/thallian/matrix-synapse + tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} + dockerfile: Dockerfile + username: + from_secret: DOCKER_USER + password: + from_secret: DOCKER_PW \ No newline at end of file From f8d3f8b73b4b77a50ab43f50fa9fb7a0b233b2f0 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Nov 2022 18:36:16 +0100 Subject: [PATCH 05/42] listen on ipv6 interfaces as well --- Dockerfile | 2 +- rootfs/etc/confd/templates/server.yaml.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d0e63e..ca279e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.16 AS builder -ENV VERSION=v1.68.0 +ENV VERSION=v1.71.0 RUN apk add --no-cache \ alpine-sdk \ diff --git a/rootfs/etc/confd/templates/server.yaml.tmpl b/rootfs/etc/confd/templates/server.yaml.tmpl index 263b6d1..1480d34 100644 --- a/rootfs/etc/confd/templates/server.yaml.tmpl +++ b/rootfs/etc/confd/templates/server.yaml.tmpl @@ -301,7 +301,7 @@ listeners: tls: false type: http x_forwarded: true - bind_addresses: ['0.0.0.0'] + bind_addresses: ['::'] resources: - names: [client, federation] @@ -1515,7 +1515,7 @@ room_prejoin_state: app_service_config_files: {{if not (getenv "REGISTRATIONS")}}[]{{end}} {{- if (getenv "REGISTRATIONS")}} {{- range $registration := split (getenv "REGISTRATIONS") ";"}} - - {{ $registration -}} + - registrations/{{ $registration -}} {{end}} {{end}} From dd2f5eebeda2539d0d8013da709c9d3614137d7d Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Nov 2022 18:40:12 +0100 Subject: [PATCH 06/42] push to v1.72.0 --- Dockerfile | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca279e4..b249c05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,33 +1,33 @@ -FROM docker.io/alpine:3.16 AS builder +FROM docker.io/alpine:3.17 AS builder -ENV VERSION=v1.71.0 +ENV VERSION=v1.72.0 RUN apk add --no-cache \ - alpine-sdk \ - python3-dev \ - py3-pip \ + alpine-sdk \ + python3-dev \ + py3-pip \ py3-wheel \ - libffi-dev \ - openssl-dev \ - zlib-dev \ - jpeg-dev \ - rust + libffi-dev \ + openssl-dev \ + zlib-dev \ + jpeg-dev \ + rust RUN pip3 install --target="/install" matrix-synapse==$VERSION -FROM docker.io/thallian/confd-env:3.16 +FROM docker.io/thallian/confd-env:3.17 RUN addgroup -g 2222 matrix-synapse RUN adduser -h /var/lib/matrix-synapse -u 2222 -D -G matrix-synapse matrix-synapse RUN apk add --no-cache \ - python3 \ - py3-psycopg2 \ - py3-authlib \ - libffi \ - openssl \ - zlib \ - jpeg + python3 \ + py3-psycopg2 \ + py3-authlib \ + libffi \ + openssl \ + zlib \ + jpeg ENV PYTHONPATH=$PYTHONPATH:/py-pkgs COPY --from=builder /install /py-pkgs From 780ec1e5a821f20191158fdfbdb8a9c2e4b9b24c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 6 Feb 2023 09:09:04 +0100 Subject: [PATCH 07/42] push to v1.76.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b249c05..28abd73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.17 AS builder -ENV VERSION=v1.72.0 +ENV VERSION=v1.76.0 RUN apk add --no-cache \ alpine-sdk \ From c55e25bfc3940bc8234688e5f12c286c043992c3 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 16 Feb 2023 21:09:07 +0100 Subject: [PATCH 08/42] push to 1.77.0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 28abd73..f092da0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.17 AS builder -ENV VERSION=v1.76.0 +ENV VERSION=v1.77.0 RUN apk add --no-cache \ alpine-sdk \ @@ -15,7 +15,7 @@ RUN apk add --no-cache \ RUN pip3 install --target="/install" matrix-synapse==$VERSION -FROM docker.io/thallian/confd-env:3.17 +FROM docker.io/thallian/confd-env:3.17-3.1.3.0 RUN addgroup -g 2222 matrix-synapse RUN adduser -h /var/lib/matrix-synapse -u 2222 -D -G matrix-synapse matrix-synapse From 76c690416e31c1d1c721a1e53da49455a29d0780 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 29 Mar 2023 07:52:08 +0200 Subject: [PATCH 09/42] push to v 1.80.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f092da0..3896bfe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.17 AS builder -ENV VERSION=v1.77.0 +ENV VERSION=v1.80.0 RUN apk add --no-cache \ alpine-sdk \ From c6330317f9537b657909e9ca5ac8eb20a4c11871 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 7 Apr 2023 14:57:17 +0200 Subject: [PATCH 10/42] enable metrics --- rootfs/etc/confd/templates/server.yaml.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rootfs/etc/confd/templates/server.yaml.tmpl b/rootfs/etc/confd/templates/server.yaml.tmpl index 1480d34..33f997a 100644 --- a/rootfs/etc/confd/templates/server.yaml.tmpl +++ b/rootfs/etc/confd/templates/server.yaml.tmpl @@ -301,12 +301,14 @@ listeners: tls: false type: http x_forwarded: true - bind_addresses: ['::'] + bind_addresses: ['::', '0.0.0.0'] resources: - names: [client, federation] compress: false - + - port: 9000 + type: metrics + bind_addresses: ['::', '0.0.0.0'] # example additional_resources: # #additional_resources: @@ -1432,7 +1434,7 @@ account_threepid_delegates: # Enable collection and rendering of performance metrics # -enable_metrics: false +enable_metrics: true # Enable sentry integration # NOTE: While attempts are made to ensure that the logs don't contain From 3f4ac91f9f9f22edf269d3ac23061a5f9ab26ffd Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 7 Apr 2023 15:00:37 +0200 Subject: [PATCH 11/42] enable metrics --- rootfs/etc/confd/templates/server.yaml.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootfs/etc/confd/templates/server.yaml.tmpl b/rootfs/etc/confd/templates/server.yaml.tmpl index 33f997a..c08cd9f 100644 --- a/rootfs/etc/confd/templates/server.yaml.tmpl +++ b/rootfs/etc/confd/templates/server.yaml.tmpl @@ -301,14 +301,14 @@ listeners: tls: false type: http x_forwarded: true - bind_addresses: ['::', '0.0.0.0'] + bind_addresses: ['::'] resources: - names: [client, federation] compress: false - port: 9000 type: metrics - bind_addresses: ['::', '0.0.0.0'] + bind_addresses: ['::'] # example additional_resources: # #additional_resources: From 2772f9a939fb2fc4255b956e708413d05f15fd2a Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 29 May 2023 12:42:59 +0200 Subject: [PATCH 12/42] push to 1.84.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3896bfe..36c488f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.17 AS builder -ENV VERSION=v1.80.0 +ENV VERSION=v1.84.1 RUN apk add --no-cache \ alpine-sdk \ From 944b14db8c0dcbab112cdc4903c8d31ea813069c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 9 Jun 2023 11:45:38 +0200 Subject: [PATCH 13/42] push to 1.85.2 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 36c488f..413da58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM docker.io/alpine:3.17 AS builder +FROM docker.io/alpine:3.18 AS builder -ENV VERSION=v1.84.1 +ENV VERSION=v1.85.2 RUN apk add --no-cache \ alpine-sdk \ @@ -15,7 +15,7 @@ RUN apk add --no-cache \ RUN pip3 install --target="/install" matrix-synapse==$VERSION -FROM docker.io/thallian/confd-env:3.17-3.1.3.0 +FROM docker.io/thallian/confd-env:3.18-3.1.5.0 RUN addgroup -g 2222 matrix-synapse RUN adduser -h /var/lib/matrix-synapse -u 2222 -D -G matrix-synapse matrix-synapse From a53924d0b6a35ead50f8291573dd84816ffdcd50 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sun, 25 Jun 2023 16:16:37 +0200 Subject: [PATCH 14/42] push to 1.86.0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 413da58..6abcdc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ FROM docker.io/alpine:3.18 AS builder -ENV VERSION=v1.85.2 +ENV VERSION=v1.86.0 RUN apk add --no-cache \ alpine-sdk \ python3-dev \ py3-pip \ - py3-wheel \ + py3-wheel \ libffi-dev \ openssl-dev \ zlib-dev \ From 244bf3bc55701d5d36b573d59192b410dfee3731 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 21 Jul 2023 08:09:22 +0200 Subject: [PATCH 15/42] push to 1.88.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6abcdc5..9358f45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.18 AS builder -ENV VERSION=v1.86.0 +ENV VERSION=v1.88.0 RUN apk add --no-cache \ alpine-sdk \ From e2b02ef4a3f4819247a8ba2808aa0e64049645a8 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 22 Aug 2023 09:17:33 +0200 Subject: [PATCH 16/42] push to 1.90.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9358f45..5893a81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.18 AS builder -ENV VERSION=v1.88.0 +ENV VERSION=v1.90.0 RUN apk add --no-cache \ alpine-sdk \ From e1c134168ecee88148a0e290c79d78121226b2d0 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 7 Sep 2023 07:57:13 +0200 Subject: [PATCH 17/42] push to 1.91.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5893a81..42c55f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.18 AS builder -ENV VERSION=v1.90.0 +ENV VERSION=v1.91.2 RUN apk add --no-cache \ alpine-sdk \ From e379eefa7b564c9b5ad2a072c9c5fd80ec1a3714 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 19 Sep 2023 09:23:53 +0200 Subject: [PATCH 18/42] push to 1.92.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 42c55f9..e3f426c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.18 AS builder -ENV VERSION=v1.91.2 +ENV VERSION=v1.92.3 RUN apk add --no-cache \ alpine-sdk \ From de070df02a2409aa2e16a64d854e3909eb3fae6c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 10 Oct 2023 14:33:44 +0200 Subject: [PATCH 19/42] push to 1.94.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e3f426c..af6d61e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.18 AS builder -ENV VERSION=v1.92.3 +ENV VERSION=v1.94.0 RUN apk add --no-cache \ alpine-sdk \ From 85e041785f0992ded46fdb039663075eec9f8db6 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 17 Nov 2023 16:04:17 +0100 Subject: [PATCH 20/42] push to 1.96.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index af6d61e..a3f45ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.18 AS builder -ENV VERSION=v1.94.0 +ENV VERSION=v1.96.1 RUN apk add --no-cache \ alpine-sdk \ From dd5c661cdedcaeba0c1420b27a2d7d592620f3f0 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 1 Jan 2024 19:58:27 +0100 Subject: [PATCH 21/42] push to 1.98.0 --- .gitea/workflows/container.yaml | 12 ++++++++++++ .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 19 +++++++++++++------ 3 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (67%) diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml new file mode 100644 index 0000000..e48b3fd --- /dev/null +++ b/.gitea/workflows/container.yaml @@ -0,0 +1,12 @@ +name: Build Multiarch Container Image +on: [push] +jobs: + call-reusable-workflow: + uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main + with: + repository: ${{ gitea.repository }} + ref_name: ${{ gitea.ref_name }} + sha: ${{ gitea.sha }} + registry_url: ${{ secrets.REGISTRY_URL }} + registry_user: ${{ secrets.REGISTRY_USER }} + registry_pw: ${{ secrets.REGISTRY_PW }} diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index c92c5fb..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/matrix-synapse - tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} - dockerfile: Dockerfile - username: - from_secret: DOCKER_USER - password: - from_secret: DOCKER_PW \ No newline at end of file diff --git a/Dockerfile b/Containerfile similarity index 67% rename from Dockerfile rename to Containerfile index a3f45ab..0428539 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,6 +1,4 @@ -FROM docker.io/alpine:3.18 AS builder - -ENV VERSION=v1.96.1 +FROM docker.io/alpine:3.19 AS builder RUN apk add --no-cache \ alpine-sdk \ @@ -11,11 +9,20 @@ RUN apk add --no-cache \ openssl-dev \ zlib-dev \ jpeg-dev \ - rust + rust \ + poetry \ + git -RUN pip3 install --target="/install" matrix-synapse==$VERSION +ENV VERSION=v1.98.0 +RUN git clone https://github.com/element-hq/synapse.git +WORKDIR /synapse +RUN git checkout $VERSION -FROM docker.io/thallian/confd-env:3.18-3.1.5.0 +RUN poetry export -o /synapse/requirements.txt +RUN pip3 install --target="/install" -r /synapse/requirements.txt + + +FROM docker.io/thallian/confd-env:3.19-3.1.6.2 RUN addgroup -g 2222 matrix-synapse RUN adduser -h /var/lib/matrix-synapse -u 2222 -D -G matrix-synapse matrix-synapse From bbae3ba73ead9a15ac1028915d1015113c491c1e Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 28 Mar 2024 14:00:14 +0100 Subject: [PATCH 22/42] push to 1.103.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 0428539..04a6770 100644 --- a/Containerfile +++ b/Containerfile @@ -13,7 +13,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.98.0 +ENV VERSION=v1.103.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 6c75747f7999177737dad9009859f6209a9f9ae5 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 13 Apr 2024 19:03:55 +0200 Subject: [PATCH 23/42] push to 1.104.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 04a6770..808eb82 100644 --- a/Containerfile +++ b/Containerfile @@ -13,7 +13,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.103.0 +ENV VERSION=v1.104.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 6e929b2d1659b98f32d517055121c4c135883a2b Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 22 Apr 2024 13:48:59 +0200 Subject: [PATCH 24/42] push to 1.105.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 808eb82..2118758 100644 --- a/Containerfile +++ b/Containerfile @@ -13,7 +13,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.104.0 +ENV VERSION=v1.105.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 92139571e8ead9c1608ef157f0c0455f201f2eb2 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 23 Apr 2024 19:10:58 +0200 Subject: [PATCH 25/42] push to 1.105.1 --- Containerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 2118758..fd7bac7 100644 --- a/Containerfile +++ b/Containerfile @@ -10,16 +10,18 @@ RUN apk add --no-cache \ zlib-dev \ jpeg-dev \ rust \ + cargo \ poetry \ git -ENV VERSION=v1.105.0 +ENV VERSION=v1.105.1 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION RUN poetry export -o /synapse/requirements.txt RUN pip3 install --target="/install" -r /synapse/requirements.txt +RUN pip3 install --target="/install" --no-deps --no-warn-script-location /synapse[all]; FROM docker.io/thallian/confd-env:3.19-3.1.6.2 From 44e4103c22bd16b9bda025b1ce32045010e54d0f Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 31 May 2024 10:19:36 +0200 Subject: [PATCH 26/42] push to 1.108.0 --- Containerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index fd7bac7..aea5fc1 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/alpine:3.19 AS builder +FROM docker.io/alpine:3.20 AS builder RUN apk add --no-cache \ alpine-sdk \ @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.105.1 +ENV VERSION=v1.108.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION @@ -24,7 +24,7 @@ RUN pip3 install --target="/install" -r /synapse/requirements.txt RUN pip3 install --target="/install" --no-deps --no-warn-script-location /synapse[all]; -FROM docker.io/thallian/confd-env:3.19-3.1.6.2 +FROM docker.io/thallian/confd-env:3.20-3.1.6.2 RUN addgroup -g 2222 matrix-synapse RUN adduser -h /var/lib/matrix-synapse -u 2222 -D -G matrix-synapse matrix-synapse From 843cb13e5568c406b1c6c3b2f40b884cb2b30bfb Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 27 Jun 2024 11:39:53 +0200 Subject: [PATCH 27/42] push to 1.109.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index aea5fc1..8565cfa 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.108.0 +ENV VERSION=v1.109.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 512b07c72dcbbb99bb48201ce5cf82de2aadf063 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 18 Jul 2024 09:12:18 +0200 Subject: [PATCH 28/42] push to 1.111.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 8565cfa..343f74c 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.109.0 +ENV VERSION=v1.111.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 471ec62d02ce275a5973ef2c6793fd80eb9e5a64 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sun, 4 Aug 2024 13:13:22 +0200 Subject: [PATCH 29/42] push to 1.112.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 343f74c..71ae565 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.111.0 +ENV VERSION=v1.112.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From d030d9cfda8e55c3d5e11e668dad97ec65f0d0f6 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 2 Oct 2024 08:18:13 +0200 Subject: [PATCH 30/42] push to 1.116.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 71ae565..c103b2c 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.112.0 +ENV VERSION=v1.116.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 202be63c7a76580c2cdc0237962694a662a207e1 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 1 Nov 2024 08:12:46 +0100 Subject: [PATCH 31/42] push to 1.118.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index c103b2c..42aead4 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.116.0 +ENV VERSION=v1.118.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 7df2bdd0b39768c98108d223ff129d8029069325 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 25 Nov 2024 17:21:45 +0100 Subject: [PATCH 32/42] push to 1.119.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 42aead4..86eb0a7 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.118.0 +ENV VERSION=v1.119.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 963a7039ea64a2cab3797cc5be1c47983a885d00 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 27 Nov 2024 12:17:31 +0100 Subject: [PATCH 33/42] push to 1.120.0 --- Containerfile | 2 +- rootfs/etc/confd/templates/server.yaml.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 86eb0a7..7dcd2c7 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.119.0 +ENV VERSION=v1.120.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION diff --git a/rootfs/etc/confd/templates/server.yaml.tmpl b/rootfs/etc/confd/templates/server.yaml.tmpl index c08cd9f..a40bb9f 100644 --- a/rootfs/etc/confd/templates/server.yaml.tmpl +++ b/rootfs/etc/confd/templates/server.yaml.tmpl @@ -1141,7 +1141,7 @@ oembed: # Defaults to "https://www.recaptcha.net/recaptcha/api/siteverify". # #recaptcha_siteverify_api: "https://my.recaptcha.site" - +enable_authenticated_media: true ## TURN ## From b75bd77fac2626f66586fce917d455e8ad7a289a Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 12 Dec 2024 10:26:31 +0100 Subject: [PATCH 34/42] push to 1.121.1 --- Containerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index 7dcd2c7..e0202a7 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/alpine:3.20 AS builder +FROM docker.io/alpine:3.21 AS builder RUN apk add --no-cache \ alpine-sdk \ @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.120.0 +ENV VERSION=v1.121.1 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION @@ -24,7 +24,7 @@ RUN pip3 install --target="/install" -r /synapse/requirements.txt RUN pip3 install --target="/install" --no-deps --no-warn-script-location /synapse[all]; -FROM docker.io/thallian/confd-env:3.20-3.1.6.2 +FROM docker.io/thallian/confd-env:3.21-3.2.0.2 RUN addgroup -g 2222 matrix-synapse RUN adduser -h /var/lib/matrix-synapse -u 2222 -D -G matrix-synapse matrix-synapse From d5f53386fb0cec2d2e8a316702bd21199bdc02dc Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 17 Feb 2025 10:23:42 +0100 Subject: [PATCH 35/42] push to 1.124.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index e0202a7..d8ca1c3 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.121.1 +ENV VERSION=v1.124.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 812ea36541daa3e323afb0e6eecde2a4a8a8ddd6 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 4 Mar 2025 19:40:49 +0100 Subject: [PATCH 36/42] push to 1.125.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index d8ca1c3..56f51a2 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.124.0 +ENV VERSION=v1.125.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 483e9d577c57025365c733419358a72eccc8e107 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 27 Mar 2025 07:45:29 +0100 Subject: [PATCH 37/42] push to 1.127.1 --- Containerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 56f51a2..d595212 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.125.0 +ENV VERSION=v1.127.1 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION @@ -33,6 +33,7 @@ RUN apk add --no-cache \ python3 \ py3-psycopg2 \ py3-authlib \ + py3-asn1 \ libffi \ openssl \ zlib \ From 4077eccad755f1695bf1959c8c04071555d1976c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Apr 2025 14:23:13 +0200 Subject: [PATCH 38/42] push to 1.128.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index d595212..6a94c17 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.127.1 +ENV VERSION=v1.128.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 39046df8f113e037a324ae217c15d4a426d48cbb Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 22 May 2025 09:45:37 +0200 Subject: [PATCH 39/42] push to 1.130.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 6a94c17..e09197b 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.128.0 +ENV VERSION=v1.130.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From b7ffb89f172cd58587bedb98fe051b6e7ccc918d Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 6 Jun 2025 08:57:05 +0200 Subject: [PATCH 40/42] push to 1.131.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index e09197b..0667d99 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.130.0 +ENV VERSION=v1.131.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION From 0e421f266010342330401ae1bda762cc7562ce22 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 6 Jun 2025 08:59:29 +0200 Subject: [PATCH 41/42] setup jenkins --- .gitea/workflows/container.yaml | 12 ------------ Jenkinsfile | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .gitea/workflows/container.yaml create mode 100644 Jenkinsfile diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml deleted file mode 100644 index e48b3fd..0000000 --- a/.gitea/workflows/container.yaml +++ /dev/null @@ -1,12 +0,0 @@ -name: Build Multiarch Container Image -on: [push] -jobs: - call-reusable-workflow: - uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main - with: - repository: ${{ gitea.repository }} - ref_name: ${{ gitea.ref_name }} - sha: ${{ gitea.sha }} - registry_url: ${{ secrets.REGISTRY_URL }} - registry_user: ${{ secrets.REGISTRY_USER }} - registry_pw: ${{ secrets.REGISTRY_PW }} diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..a8bfde8 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1 @@ +multiarch_container() From 6564926c091ff1a40343cd31f0b615ac8627cecc Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 20 Jun 2025 08:10:18 +0200 Subject: [PATCH 42/42] push to 1.132.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 0667d99..755d847 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache \ poetry \ git -ENV VERSION=v1.131.0 +ENV VERSION=v1.132.0 RUN git clone https://github.com/element-hq/synapse.git WORKDIR /synapse RUN git checkout $VERSION