From 944b14db8c0dcbab112cdc4903c8d31ea813069c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 9 Jun 2023 11:45:38 +0200 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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 10/10] 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