From 5048243b6643b6d223902c3bc2b0e146525a8d3c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 18 Nov 2022 10:40:42 +0100 Subject: [PATCH 01/10] update config file --- rootfs/etc/confd/templates/config.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index e69dc1a..f08704d 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -26,7 +26,7 @@ homeserver: # Changing these values requires regeneration of the registration. appservice: # The address that the homeserver can use to connect to this appservice. - address: http://localhost:29317 + address: http://{{getenv "HOSTNAME"}}:29317 # When using https:// the TLS certificate and key files for the address. tls_cert: false tls_key: false From dbad285bffcef3d49458e6660f9f43aef433e73c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sun, 20 Nov 2022 14:11:32 +0100 Subject: [PATCH 02/10] try to listen on ipv6 as well --- rootfs/etc/confd/templates/config.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index f08704d..b390fd3 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -32,7 +32,7 @@ appservice: tls_key: false # The hostname and port where this appservice should listen. - hostname: :: + hostname: [::] port: 29317 # The maximum body size of appservice API requests (from the homeserver) in mebibytes # Usually 1 is enough, but on high-traffic bridges you might need to increase this to avoid 413s From 00f1128297d3676c9db6d9613359abd164e38266 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 24 Nov 2022 08:27:49 +0100 Subject: [PATCH 03/10] push to 24b33845 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8e91c9..2a0963d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM docker.io/alpine:3.16 as builder +FROM docker.io/alpine:3.17 as builder -ENV VERSION=5558fc7157361e3c7f721fc7c82a1d5a084a96de +ENV VERSION=24b33845707689b735292464f5d6235737a7df21 RUN apk --no-cache add \ sed \ @@ -46,7 +46,7 @@ RUN pip3 install --prefix=/install --upgrade -r optional-requirements.txt RUN cp -r mautrix_telegram /install/lib/python3.10/site-packages/ -FROM docker.io/thallian/confd-env:3.16 +FROM docker.io/thallian/confd-env:3.17 ENV FFMPEG_BINARY=/usr/bin/ffmpeg From 77b274973e4be1871d2f01c7dc7ca29c053c37e7 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 24 Nov 2022 08:39:10 +0100 Subject: [PATCH 04/10] allow key sharing --- rootfs/etc/confd/templates/config.yaml.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index b390fd3..ed14736 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -265,12 +265,12 @@ bridge: # This will cause the bridge bot to be in private chats for the encryption to work properly. default: true # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data. - appservice: false + appservice: true # Require encryption, drop any unencrypted messages. require: false # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled. # You must use a client that supports requesting keys from other users to use this feature. - allow_key_sharing: false + allow_key_sharing: true # What level of device verification should be required from users? # # Valid levels: From f0bd0e452b4a009bb0ff96a0a391ce65b7ca3a47 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 6 Apr 2023 11:11:56 +0200 Subject: [PATCH 05/10] push to 59ab7be28353b99f41eb18c3baee14355257ae16 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2a0963d..601a4e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.17 as builder -ENV VERSION=24b33845707689b735292464f5d6235737a7df21 +ENV VERSION=59ab7be28353b99f41eb18c3baee14355257ae16 RUN apk --no-cache add \ sed \ @@ -46,7 +46,7 @@ RUN pip3 install --prefix=/install --upgrade -r optional-requirements.txt RUN cp -r mautrix_telegram /install/lib/python3.10/site-packages/ -FROM docker.io/thallian/confd-env:3.17 +FROM docker.io/thallian/confd-env:3.17-3.1.3.0 ENV FFMPEG_BINARY=/usr/bin/ffmpeg From 6b3b7b143da3de715cda4e9252c5d3b701595ce6 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 6 Apr 2023 13:35:17 +0200 Subject: [PATCH 06/10] use /sync for encryption data --- rootfs/etc/confd/templates/config.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index ed14736..c86ba0e 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -265,7 +265,7 @@ bridge: # This will cause the bridge bot to be in private chats for the encryption to work properly. default: true # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data. - appservice: true + appservice: false # Require encryption, drop any unencrypted messages. require: false # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled. From 637b01c2d17e77e484dd9df20e3c6f5e79326e63 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 31 Jul 2023 11:52:43 +0200 Subject: [PATCH 07/10] push to 23ec6911 --- Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 601a4e4..b5e85d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM docker.io/alpine:3.17 as builder +FROM docker.io/alpine:3.18 as builder -ENV VERSION=59ab7be28353b99f41eb18c3baee14355257ae16 +ENV VERSION=23ec691128d30545c208c06eb4805443e292eb23 RUN apk --no-cache add \ sed \ - gcc \ + gcc \ g++ \ git \ musl-dev \ @@ -12,7 +12,7 @@ RUN apk --no-cache add \ python3-dev \ rust \ cargo \ - py3-pip \ + py3-pip \ py3-wheel \ py3-brotli \ py3-olm \ @@ -43,10 +43,10 @@ WORKDIR /telegram RUN git checkout "$VERSION" RUN pip3 install --prefix=/install --upgrade -r requirements.txt RUN pip3 install --prefix=/install --upgrade -r optional-requirements.txt -RUN cp -r mautrix_telegram /install/lib/python3.10/site-packages/ +RUN cp -r mautrix_telegram /install/lib/python3.11/site-packages/ -FROM docker.io/thallian/confd-env:3.17-3.1.3.0 +FROM docker.io/thallian/confd-env:3.18-3.1.5.0 ENV FFMPEG_BINARY=/usr/bin/ffmpeg @@ -56,11 +56,11 @@ RUN addgroup -g 2222 matrix-bridge RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge RUN apk --no-cache add \ - ca-certificates \ - ffmpeg \ - libffi \ + ca-certificates \ + ffmpeg \ + libffi \ python3 \ - py3-brotli \ + py3-brotli \ py3-olm \ py3-qrcode \ py3-pillow \ @@ -84,7 +84,7 @@ RUN apk --no-cache add \ py3-mako \ py3-setuptools -ENV PYTHONPATH=/usr/lib/python3.10/site-packages:/py-pkgs/lib/python3.10/site-packages/ +ENV PYTHONPATH=/usr/lib/python3.11/site-packages:/py-pkgs/lib/python3.11/site-packages/ WORKDIR /var/lib/matrix-bridge From aad509a99a189c027fe52b8e9b954389159b87bb Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 22 Sep 2023 11:45:17 +0200 Subject: [PATCH 08/10] push to 23ec691128d30545c208c06eb4805443e292eb23 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b5e85d2..0a26a85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.18 as builder -ENV VERSION=23ec691128d30545c208c06eb4805443e292eb23 +ENV VERSION=22f91d51a318023da74d5a368819595553e3c347 RUN apk --no-cache add \ sed \ From 915ea9eb02ef9794a2268ac44b6e1d0cdbc5ce1a Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 26 Sep 2023 18:01:29 +0200 Subject: [PATCH 09/10] push to 0.14.2 --- Dockerfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0a26a85..6ea6e67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/alpine:3.18 as builder -ENV VERSION=22f91d51a318023da74d5a368819595553e3c347 +ENV VERSION=v0.14.2 RUN apk --no-cache add \ sed \ @@ -14,11 +14,9 @@ RUN apk --no-cache add \ cargo \ py3-pip \ py3-wheel \ - py3-brotli \ py3-olm \ py3-qrcode \ py3-pillow \ - py3-phonenumbers \ py3-unpaddedbase64 \ py3-pycryptodome \ py3-pyaes \ @@ -30,13 +28,10 @@ RUN apk --no-cache add \ py3-numpy \ py3-future \ py3-asn1 \ - py3-ruamel.yaml \ py3-magic \ py3-commonmark \ - py3-aiohttp \ py3-yarl \ - py3-mako \ - py3-setuptools + py3-mako RUN git clone https://github.com/mautrix/telegram.git WORKDIR /telegram From 6f4dfc6e92972055ac7c10d08cc2749134929607 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 2 Jan 2024 11:56:36 +0100 Subject: [PATCH 10/10] push to 0.15.1 --- .gitea/workflows/container.yaml | 12 ++++++++++++ .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 7 ++++--- 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (93%) 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 b4844fc..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/matrix-appservice-telegram - 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 93% rename from Dockerfile rename to Containerfile index 6ea6e67..5b19794 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,6 +1,5 @@ -FROM docker.io/alpine:3.18 as builder +FROM docker.io/alpine:3.19 as builder -ENV VERSION=v0.14.2 RUN apk --no-cache add \ sed \ @@ -33,6 +32,8 @@ RUN apk --no-cache add \ py3-yarl \ py3-mako +ENV VERSION=v0.15.1 + RUN git clone https://github.com/mautrix/telegram.git WORKDIR /telegram RUN git checkout "$VERSION" @@ -41,7 +42,7 @@ RUN pip3 install --prefix=/install --upgrade -r optional-requirements.txt RUN cp -r mautrix_telegram /install/lib/python3.11/site-packages/ -FROM docker.io/thallian/confd-env:3.18-3.1.5.0 +FROM docker.io/thallian/confd-env:3.19-3.1.6.2 ENV FFMPEG_BINARY=/usr/bin/ffmpeg