From 55b4463d78aed0a42076a741f189ca3a1927216a Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 31 Jul 2023 12:06:19 +0200 Subject: [PATCH 01/11] push to 0.6.0 --- Dockerfile | 8 ++++---- rootfs/etc/confd/templates/config.yaml.tmpl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0528411..ae76d98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM docker.io/golang:1.19.3-alpine3.17 as builder +FROM docker.io/golang:1.20-alpine3.18 as builder -ENV VERSION=v0.2.0 +ENV VERSION=v0.6.0 RUN apk --no-cache add \ git \ @@ -18,7 +18,7 @@ RUN git checkout $VERSION RUN go build -o /build/bin/mautrix-discord -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-bridge RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge @@ -28,7 +28,7 @@ COPY --from=builder /build/bin/mautrix-discord /bin/mautrix-discord RUN apk --no-cache add \ ca-certificates \ libstdc++ \ - olm + olm WORKDIR /var/lib/matrix-bridge diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index d6cadb5..8335c02 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -83,7 +83,7 @@ bridge: # .Discriminator - The 4 numbers after the name on Discord # .Bot - Whether the user is a bot # .System - Whether the user is an official system user - displayname_template: '{{"{{"}}.Username{{"}}"}}#{{"{{"}}.Discriminator{{"}}"}}{{"{{"}}if .Bot{{"}}"}} (bot){{"{{"}}end{{"}}"}}' + displayname_template: '{{"{{"}}or .GlobalName .Username{{"}}"}}{{"{{"}}if .Bot{{"}}"}} (bot){{"{{"}}end{{"}}"}}' # Displayname template for Discord channels (bridged as rooms, or spaces when type=4). # Available variables: # .Name - Channel name, or user displayname (pre-formatted with displayname_template) in DMs. From 542fadb18579838db3ba7d7a82e352945bfb6706 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 22 Aug 2023 09:16:07 +0200 Subject: [PATCH 02/11] push to 0.6.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ae76d98..3a7412b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/golang:1.20-alpine3.18 as builder -ENV VERSION=v0.6.0 +ENV VERSION=v0.6.1 RUN apk --no-cache add \ git \ From f138a350f930692048f59bb74924e54be41249b1 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 22 Sep 2023 11:43:12 +0200 Subject: [PATCH 03/11] push to 0.6.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3a7412b..a9dd713 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/golang:1.20-alpine3.18 as builder -ENV VERSION=v0.6.1 +ENV VERSION=v0.6.2 RUN apk --no-cache add \ git \ From 2c886bc537c879030b0ec61b66077bb11e9bd484 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 1 Jan 2024 20:23:32 +0100 Subject: [PATCH 04/11] push to 0.6.4 --- .gitea/workflows/container.yaml | 12 ++++++++++++ .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 8 +++++--- 3 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (82%) 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 763b5ae..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/matrix-appservice-discord - tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} - dockerfile: Dockerfile - username: - from_secret: DOCKER_USER - password: - from_secret: DOCKER_PW diff --git a/Dockerfile b/Containerfile similarity index 82% rename from Dockerfile rename to Containerfile index a9dd713..2483162 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,6 +1,6 @@ -FROM docker.io/golang:1.20-alpine3.18 as builder +FROM docker.io/golang:1.21-alpine3.19 as builder -ENV VERSION=v0.6.2 +ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE" RUN apk --no-cache add \ git \ @@ -12,13 +12,15 @@ RUN apk --no-cache add \ RUN ln -s /usr/lib/libstdc++.so.6 /usr/lib/libstdc++.so WORKDIR /build + +ENV VERSION=v0.6.4 RUN git clone https://github.com/mautrix/discord.git WORKDIR /build/discord RUN git checkout $VERSION RUN go build -o /build/bin/mautrix-discord -FROM docker.io/thallian/confd-env:3.18-3.1.5.0 +FROM docker.io/thallian/confd-env:3.19-3.1.6.2 RUN addgroup -g 2222 matrix-bridge RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge From b5fac1075771499e782b8904699af11738549e09 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 28 Mar 2024 13:49:52 +0100 Subject: [PATCH 05/11] push to 0.6.5 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 2483162..8fbf8df 100644 --- a/Containerfile +++ b/Containerfile @@ -13,7 +13,7 @@ RUN ln -s /usr/lib/libstdc++.so.6 /usr/lib/libstdc++.so WORKDIR /build -ENV VERSION=v0.6.4 +ENV VERSION=v0.6.5 RUN git clone https://github.com/mautrix/discord.git WORKDIR /build/discord RUN git checkout $VERSION From 17518603c674b2aa168a47981845926dae874d28 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sun, 4 Aug 2024 13:35:16 +0200 Subject: [PATCH 06/11] push to 0.7.0 --- Containerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index 8fbf8df..edfadb0 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/golang:1.21-alpine3.19 as builder +FROM docker.io/golang:1.22-alpine3.20 as builder ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE" @@ -13,14 +13,14 @@ RUN ln -s /usr/lib/libstdc++.so.6 /usr/lib/libstdc++.so WORKDIR /build -ENV VERSION=v0.6.5 +ENV VERSION=v0.7.0 RUN git clone https://github.com/mautrix/discord.git WORKDIR /build/discord RUN git checkout $VERSION RUN go build -o /build/bin/mautrix-discord -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-bridge RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge From 213ab51d051c6b5e0941e7d2703e5a9f5baf68f6 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 25 Nov 2024 17:20:32 +0100 Subject: [PATCH 07/11] push to 0.7.1 --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index edfadb0..94b4f74 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/golang:1.22-alpine3.20 as builder +FROM docker.io/golang:1.23-alpine3.20 as builder ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE" @@ -13,7 +13,7 @@ RUN ln -s /usr/lib/libstdc++.so.6 /usr/lib/libstdc++.so WORKDIR /build -ENV VERSION=v0.7.0 +ENV VERSION=v0.7.1 RUN git clone https://github.com/mautrix/discord.git WORKDIR /build/discord RUN git checkout $VERSION From 0cd8b71aba56bd7d749c5f7edb6b81d26807163f Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 10 Jan 2025 14:17:48 +0100 Subject: [PATCH 08/11] push to 0.7.2 --- Containerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index 94b4f74..78a3e93 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/golang:1.23-alpine3.20 as builder +FROM docker.io/golang:1.23-alpine3.21 as builder ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE" @@ -13,14 +13,14 @@ RUN ln -s /usr/lib/libstdc++.so.6 /usr/lib/libstdc++.so WORKDIR /build -ENV VERSION=v0.7.1 +ENV VERSION=v0.7.2 RUN git clone https://github.com/mautrix/discord.git WORKDIR /build/discord RUN git checkout $VERSION RUN go build -o /build/bin/mautrix-discord -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-bridge RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge From c837d999a7e08f694ced7c5170d89e28a2185dca Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Apr 2025 17:54:17 +0200 Subject: [PATCH 09/11] push to 0.7.3 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 78a3e93..903ecdc 100644 --- a/Containerfile +++ b/Containerfile @@ -13,7 +13,7 @@ RUN ln -s /usr/lib/libstdc++.so.6 /usr/lib/libstdc++.so WORKDIR /build -ENV VERSION=v0.7.2 +ENV VERSION=v0.7.3 RUN git clone https://github.com/mautrix/discord.git WORKDIR /build/discord RUN git checkout $VERSION From aaa2470c696b3334fb483e15d0039c462854c2f4 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 20 Jun 2025 08:15:49 +0200 Subject: [PATCH 10/11] push to 0.7.4 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 903ecdc..5ff2a19 100644 --- a/Containerfile +++ b/Containerfile @@ -13,7 +13,7 @@ RUN ln -s /usr/lib/libstdc++.so.6 /usr/lib/libstdc++.so WORKDIR /build -ENV VERSION=v0.7.3 +ENV VERSION=v0.7.4 RUN git clone https://github.com/mautrix/discord.git WORKDIR /build/discord RUN git checkout $VERSION From d0419da9c603c73eb8bdfa5c4b8937e13806a571 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 20 Jun 2025 08:17:05 +0200 Subject: [PATCH 11/11] use 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()