From dd5c661cdedcaeba0c1420b27a2d7d592620f3f0 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Mon, 1 Jan 2024 19:58:27 +0100
Subject: [PATCH] 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